Version bump for beta 2

Removed some logging to make test debugging less verbose
Add Error DIV's to all modals (#3886 )
2017-08-24 23:32:33 -07:00 · 2017-08-24 23:20:51 -07:00 · 2017-08-24 22:43:05 -07:00 · 2017-08-24 22:40:07 -07:00 · 2017-08-24 22:24:02 -07:00 · 2017-08-24 17:21:50 -07:00
4971 changed files with 577790 additions and 221330 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -0,0 +1,733 @@
+{
+  "projectName": "snipe-it",
+  "projectOwner": "snipe",
+  "files": [
+    "README.md"
+  ],
+  "imageSize": 110,
+  "commit": true,
+  "contributors": [
+    {
+      "login": "snipe",
+      "name": "snipe",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/197404?v=3",
+      "profile": "http://www.snipe.net",
+      "contributions": [
+        "code",
+        "infra",
+        "doc",
+        "test",
+        "bug",
+        "design",
+        "review"
+      ]
+    },
+    {
+      "login": "uberbrady",
+      "name": "Brady Wetherington",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/36335?v=3",
+      "profile": "http://www.uberbrady.com",
+      "contributions": [
+        "code",
+        "doc",
+        "infra",
+        "review"
+      ]
+    },
+    {
+      "login": "dmeltzer",
+      "name": "Daniel Meltzer",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/3803132?v=3",
+      "profile": "https://github.com/dmeltzer",
+      "contributions": [
+        "code",
+        "test",
+        "doc"
+      ]
+    },
+    {
+      "login": "mtucker6784",
+      "name": "Michael T",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/1609106?v=3",
+      "profile": "http://www.tuckertechonline.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "madd15",
+      "name": "madd15",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/3274937?v=3",
+      "profile": "https://github.com/madd15",
+      "contributions": [
+        "doc",
+        "question"
+      ]
+    },
+    {
+      "login": "vsposato",
+      "name": "Vincent Sposato",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/894126?v=3",
+      "profile": "https://github.com/vsposato",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "vjandrea",
+      "name": "Andrea Bergamasco",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/1639757?v=3",
+      "profile": "https://github.com/vjandrea",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "kpawelski",
+      "name": "Karol",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/10640152?v=3",
+      "profile": "https://github.com/kpawelski",
+      "contributions": [
+        "translation",
+        "code"
+      ]
+    },
+    {
+      "login": "morph027",
+      "name": "morph027",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/600106?v=3",
+      "profile": "http://blog.morph027.de/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "fvleminckx",
+      "name": "fvleminckx",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/22935755?v=3",
+      "profile": "https://github.com/fvleminckx",
+      "contributions": [
+        "infra"
+      ]
+    },
+    {
+      "login": "itsupportcmsukorg",
+      "name": "itsupportcmsukorg",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/15633547?v=3",
+      "profile": "https://github.com/itsupportcmsukorg",
+      "contributions": [
+        "code",
+        "bug"
+      ]
+    },
+    {
+      "login": "base-zero",
+      "name": "Frank",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/12373799?v=3",
+      "profile": "https://override.io",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ghost",
+      "name": "Deleted user",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/10137?v=3",
+      "profile": "https://github.com/ghost",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "tiagom62",
+      "name": "tiagom62",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/10802313?v=3",
+      "profile": "https://github.com/tiagom62",
+      "contributions": [
+        "code",
+        "infra"
+      ]
+    },
+    {
+      "login": "rystaf",
+      "name": "Ryan Stafford",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/2389047?v=3",
+      "profile": "https://github.com/rystaf",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ehanlon",
+      "name": "Eammon Hanlon",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/10345935?v=3",
+      "profile": "https://github.com/ehanlon",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "zjean",
+      "name": "zjean",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/441924?v=3",
+      "profile": "https://github.com/zjean",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "FREImedia",
+      "name": "Matthias Frei",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/12660103?v=3",
+      "profile": "http://www.frei.media",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "opsydev",
+      "name": "opsydev",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/3767518?v=3",
+      "profile": "https://github.com/opsydev",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ddreier",
+      "name": "Daniel Dreier",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/82290?v=3",
+      "profile": "http://www.ddreier.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "rassie",
+      "name": "Nikolai Prokoschenko",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/23448?v=3",
+      "profile": "http://rassie.org",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "YetAnotherCodeMonkey",
+      "name": "Drew",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/13452757?v=3",
+      "profile": "https://github.com/YetAnotherCodeMonkey",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "merid14",
+      "name": "Walter",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/1342320?v=3",
+      "profile": "https://github.com/merid14",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "balous",
+      "name": "Petr Baloun",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/11254614?v=3",
+      "profile": "https://github.com/balous",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "reidblomquist",
+      "name": "reidblomquist",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/6117660?v=3",
+      "profile": "https://github.com/reidblomquist",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "mathieuk",
+      "name": "Mathieu Kooiman",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/539914?v=3",
+      "profile": "https://github.com/mathieuk",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "csayre",
+      "name": "csayre",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/6606421?v=3",
+      "profile": "https://github.com/csayre",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "adamdunson",
+      "name": "Adam Dunson",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/768488?v=3",
+      "profile": "https://github.com/adamdunson",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "thehereward",
+      "name": "Hereward",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/5547470?v=3",
+      "profile": "https://github.com/thehereward",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "swoopdk",
+      "name": "swoopdk",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/5802977?v=3",
+      "profile": "https://github.com/swoopdk",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Ahimta",
+      "name": "Abdullah Alansari",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/3470403?v=3",
+      "profile": "https://linkedin.com/in/ahimta",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "MicaelRodrigues",
+      "name": "Micael Rodrigues",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/796443?v=3",
+      "profile": "https://github.com/MicaelRodrigues",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "patgmac",
+      "name": "Patrick Gallagher",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/614564?v=3",
+      "profile": "http://macadmincorner.com",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Miliamber",
+      "name": "Miliamber",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/7165922?v=3",
+      "profile": "https://github.com/Miliamber",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "hawk554",
+      "name": "hawk554",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/861766?v=3",
+      "profile": "https://github.com/hawk554",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "jbirdkerr",
+      "name": "Justin Kerr",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/1695622?v=3",
+      "profile": "http://jbirdkerr.net",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "irasnyd",
+      "name": "Ira W. Snyder",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/11426176?v=3",
+      "profile": "http://www.irasnyder.com/devel/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "aalaily",
+      "name": "Aladin Alaily",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/2475759?v=3",
+      "profile": "https://github.com/aalaily",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "kobie-chasehansen",
+      "name": "Chase Hansen",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/10247644?v=3",
+      "profile": "https://github.com/kobie-chasehansen",
+      "contributions": [
+        "code",
+        "question",
+        "bug"
+      ]
+    },
+    {
+      "login": "IDM-Helpdesk",
+      "name": "IDM Helpdesk",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/13545400?v=3",
+      "profile": "https://github.com/IDM-Helpdesk",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "balticer",
+      "name": "Kai",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/614439?v=3",
+      "profile": "http://balticer.de",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mdaniels5757",
+      "name": "Michael Daniels",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/8762511?v=3",
+      "profile": "http://www.michaeldaniels.me",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "tomcastleman",
+      "name": "Tom Castleman",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/1532660?v=3",
+      "profile": "http://tomcastleman.me",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "DanielNemanic",
+      "name": "Daniel Nemanic",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/10723243?v=3",
+      "profile": "https://github.com/DanielNemanic",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "southwolf",
+      "name": "SouthWolf",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/150648?v=3",
+      "profile": "https://github.com/southwolf",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ivarne",
+      "name": "Ivar Nesje",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/131616?v=3",
+      "profile": "https://github.com/ivarne",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "j0k3r",
+      "name": "Jérémy Benoist",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/62333?v=3",
+      "profile": "http://www.j0k3r.net",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "cleathley",
+      "name": "Chris Leathley",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/724344?v=3",
+      "profile": "https://github.com/cleathley",
+      "contributions": [
+        "infra"
+      ]
+    },
+    {
+      "login": "splaer",
+      "name": "splaer",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/972498?v=3",
+      "profile": "https://github.com/splaer",
+      "contributions": [
+        "bug",
+        "code"
+      ]
+    },
+    {
+      "login": "svpernova09",
+      "name": "Joe Ferguson",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/967362?v=3",
+      "profile": "http://www.joeferguson.me",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "diwanicki",
+      "name": "diwanicki",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/6108682?v=3",
+      "profile": "https://github.com/diwanicki",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "pakkua80",
+      "name": "Lee Thoong Ching",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/2527115?v=3",
+      "profile": "https://github.com/pakkua80",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "mrshu",
+      "name": "Marek Šuppa",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/461491?v=3",
+      "profile": "http://shu.io",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mizar1616",
+      "name": "Juan J. Martinez",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/8693762?v=3",
+      "profile": "https://github.com/mizar1616",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "rrdial",
+      "name": "R Ryan Dial",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/1458388?v=3",
+      "profile": "https://github.com/rrdial",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "burlito",
+      "name": "Andrej Manduch",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/2871745?v=3",
+      "profile": "https://github.com/burlito",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "technogenus",
+      "name": "Jay Richards",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/8341172?v=3",
+      "profile": "http://www.cordeos.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "leostat",
+      "name": "Alexander Innes",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/7295127?v=3",
+      "profile": "https://necurity.co.uk",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "buzzedword",
+      "name": "Danny Garcia",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/334485?v=3",
+      "profile": "https://buzzedword.codes",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "archpoint",
+      "name": "archpoint",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/366855?v=3",
+      "profile": "https://github.com/archpoint",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "jakemcgraw",
+      "name": "Jake McGraw",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/67991?v=3",
+      "profile": "http://www.jakemcgraw.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "FleischKarussel",
+      "name": "FleischKarussel",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/1714374?v=3",
+      "profile": "https://github.com/FleischKarussel",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "feeva",
+      "name": "Dylan Yi",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/319644?v=3",
+      "profile": "https://github.com/feeva",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "flashingcursor",
+      "name": "Gil Rutkowski",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/857740?v=3",
+      "profile": "http://FlashingCursor.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "desmondmorris",
+      "name": "Desmond Morris",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/129360?v=3",
+      "profile": "http://www.desmondmorris.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "peelman",
+      "name": "Nick Peelman",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/52936?v=3",
+      "profile": "http://peelman.us",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "abrahamvegh",
+      "name": "Abraham Vegh",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/53161?v=3",
+      "profile": "https://abrahamvegh.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "rashivkp",
+      "name": "Mohamed Rashid",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/2818680?v=3",
+      "profile": "https://github.com/rashivkp",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "HinchK",
+      "name": "Kasey",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/1509456?v=3",
+      "profile": "http://hinchk.github.io",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "BrettFagerlund",
+      "name": "Brett",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/10522541?v=3",
+      "profile": "https://github.com/BrettFagerlund",
+      "contributions": [
+        "test"
+      ]
+    },
+    {
+      "login": "jasonspriggs",
+      "name": "Jason Spriggs",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/16108587?v=3",
+      "profile": "http://jasonspriggs.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "n8felton",
+      "name": "Nate Felton",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/1134568?v=3",
+      "profile": "http://n8felton.wordpress.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "manassesferreira",
+      "name": "Manasses Ferreira",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/14036694?v=3",
+      "profile": "http://homepages.dcc.ufmg.br/~manassesferreira",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "steveelwood",
+      "name": "Steve",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/15913949?v=3",
+      "profile": "https://github.com/steveelwood",
+      "contributions": [
+        "test"
+      ]
+    },
+    {
+      "login": "matc",
+      "name": "matc",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/3361683?v=3",
+      "profile": "http://twitter.com/matc",
+      "contributions": [
+        "test"
+      ]
+    },
+    {
+      "login": "VanillaNinjaD",
+      "name": "Cole R. Davis",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/7405702?v=3",
+      "profile": "http://www.davisracingteam.com",
+      "contributions": [
+        "test"
+      ]
+    },
+    {
+      "login": "gibsonjoshua55",
+      "name": "gibsonjoshua55",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/10167681?v=3",
+      "profile": "https://github.com/gibsonjoshua55",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "zwerch",
+      "name": "Robin Temme",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/2809241?v=4",
+      "profile": "https://github.com/zwerch",
+      "contributions": [
+        "code"
+      ]
+    }
+  ]
+}
--- a/.env.example
+++ b/.env.example
@@ -93,3 +93,4 @@ APP_LOCKED=false
 FILESYSTEM_DISK=local
 APP_TRUSTED_PROXIES=192.168.1.1,10.0.0.1
 ALLOW_IFRAMING=false
+APP_CIPHER=AES-256-CBC
--- a/.env.testing
+++ b/.env.testing
@@ -3,7 +3,7 @@
 # --------------------------------------------
 APP_ENV=testing
 APP_DEBUG=true
-APP_KEY=ChangeMe
+APP_KEY=base64:glJpcM7BYwWiBggp3SQ/+NlRkqsBQMaGEOjemXqJzOU=
 APP_URL=http://localhost:8000
 APP_TIMEZONE='US/Pacific'
 APP_LOCALE=en
@@ -21,7 +21,7 @@ DB_PASSWORD=null
 # --------------------------------------------
 # REQUIRED: OUTGOING MAIL SERVER SETTINGS
 # --------------------------------------------
-MAIL_DRIVER=smtp
+MAIL_DRIVER=log
 MAIL_HOST=email-smtp.us-west-2.amazonaws.com
 MAIL_PORT=587
 MAIL_USERNAME=YOURUSERNAME
@@ -69,3 +69,4 @@ SECURE_COOKIES=false
 # OPTIONAL: APP LOG FORMAT
 # --------------------------------------------
 APP_LOG=single
+APP_LOG_LEVEL=debug
--- a/.env.testing-ci
+++ b/.env.testing-ci
@@ -15,13 +15,13 @@ FILESYSTEM_DISK=local
 DB_CONNECTION=mysql
 DB_HOST=localhost
 DB_DATABASE=snipeit_unit
-DB_USERNAME=travis
+DB_USERNAME=root
 DB_PASSWORD=null

 # --------------------------------------------
 # REQUIRED: OUTGOING MAIL SERVER SETTINGS
 # --------------------------------------------
-MAIL_DRIVER=smtp
+MAIL_DRIVER=log
 MAIL_HOST=email-smtp.us-west-2.amazonaws.com
 MAIL_PORT=587
 MAIL_USERNAME=YOURUSERNAME
--- a/.env.tests
+++ b/.env.tests
@@ -1,9 +1,22 @@
-APP_ENV=local
+APP_ENV=testing
 APP_DEBUG=true
 APP_URL=http://snipe-it.localapp
-DB_CONNECTION=mysql
+DB_CONNECTION=sqlite_testing
+DB_DEFAULT=sqlite_testing
 DB_HOST=localhost
 DB_DATABASE=snipeittests
 DB_USERNAME=snipeit
 DB_PASSWORD=snipe
 APP_KEY=base64:tu9NRh/a6+dCXBDGvg0Gv/0TcABnFsbT4AKxrr8mwQo=
+
+
+# --------------------------------------------
+# OPTIONAL: LOGIN THROTTLING
+# (LOGIN_LOCKOUT_DURATIONin minutes)
+# --------------------------------------------
+LOGIN_MAX_ATTEMPTS=1000000
+LOGIN_LOCKOUT_DURATION=100000000
+
+MAIL_DRIVER=log
+MAIL_FROM_ADDR=you@example.com
+MAIL_FROM_NAME=Snipe-IT
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -0,0 +1,22 @@
+# Code ownership for pull request reviews, per
+# the feature detailed here:
+
+# https://github.com/blog/2392-introducing-code-owners
+# https://help.github.com/articles/about-codeowners/
+
+# These owners will be the default owners for everything in the repo.
+* @snipe
+
+# Order is important. The last matching pattern has the most precedence.
+# So if a pull request only touches javascript files, only these owners
+# will be requested to review.
+
+# For example:
+#  *.js    @octocat @github/js
+
+
+app/Importer/*  @dmeltzer
+app/Http/Controllers/CustomFields* @uberbrady
+app/Http/Controllers/Api/CustomFields* @uberbrady
+resources/views/custom_fields/* @uberbrady
+docker/* @uberbrady
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,7 @@ tests/_data/scenarios
 tests/_output/*
 tests/_support/_generated/*
 /npm-debug.log
+/storage/oauth-private.key
+/storage/oauth-public.key
+
+*.cache
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,9 @@ sudo: false
 # see http://about.travis-ci.org/docs/user/languages/php/ for more hints
 language: php

+services:
+  - mysql
+
 # list any PHP version you want to test against
 php:
  - 5.6
@@ -14,18 +17,22 @@ php:
 # execute any number of scripts before the test run, custom env's are available as variables
 before_script:
  - phantomjs --webdriver=4444  &
-  - sleep 10
-  - mysql -e "create database IF NOT EXISTS snipeit_unit;" -utravis
+  - sleep 4
+  - mysql -e 'CREATE DATABASE snipeit_unit;'
+  - mysql -e 'CREATE USER "travis'@'localhost";'
+  - mysql -e 'GRANT ALL PRIVILEGES ON * . * TO "travis'@'localhost";'
+  - mysql -e 'FLUSH PRIVILEGES;'
  - composer self-update
  - composer install -n --prefer-source
-  - cp .env.testing-ci .env
  - chmod -R 777 storage
-  - php artisan migrate --database=mysql --force
+  - php artisan migrate --env=testing-ci --database=mysql --force
  - ./vendor/bin/codecept build
-  - php artisan key:generate
-  - php artisan db:seed --database=mysql --force
-  - php artisan snipeit:create-admin --first_name=Alison --last_name=Foobar --email=me@example.com --username=snipe --password=password
-  - php artisan serve --port=8000 --host=localhost &
+  - php artisan --env=testing-ci key:generate 
+  - php artisan --env=testing-ci snipeit:travisci-install
+  - php artisan --env=testing-ci db:seed --database=mysql --force
+  - php artisan --env=testing-ci snipeit:create-admin --first_name=Alison --last_name=Foobar --email=me@example.com --username=snipe --password=password
+  - php artisan --env=testing-ci passport:install
+  - php artisan serve --env=testing-ci --port=8000 --host=localhost &
  - sleep 5
  - pip install --user codecov
  - sleep 5
@@ -34,16 +41,21 @@ before_script:

 # omitting "script:" will default to phpunit
 # use the $DB env variable to determine the phpunit.xml to use
-# script: ./vendor/bin/codecept run --env testing-ci - broken :(
-script: ./vendor/bin/codecept run unit --env testing-ci
+# script: ./vendor/bin/codecept run --env testing-ci
+script:
+  - ./vendor/bin/codecept run unit --env testing-ci
+#  - ./vendor/bin/codecept run acceptance --env=testing-ci
+  - ./vendor/bin/codecept run functional --env=functional-travis
 #script: ./vendor/bin/codecept run
+  - ./vendor/bin/codecept run api --env=testing-ci

 after_success:
  - codecov

 after_failure:
-  - cat tests/_output/AccessoriesCept.fail.html
+  - cat tests/_output/*.fail.html
  - curl http://localhost:8000/login
+  - cat storage/logs/laravel.log

 # configure notifications (email, IRC, campfire etc)
 notifications:
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,6 @@
+### Contributing
+
+Please see the documentation on [contributing and developing for Snipe-IT](https://snipe-it.readme.io/docs/contributing).
+
+
+Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
--- a/47
+++ b/47
@@ -1,27 +1,35 @@
-FROM ubuntu:trusty
+FROM ubuntu:xenial
 MAINTAINER Brady Wetherington <uberbrady@gmail.com>

 RUN apt-get update && apt-get install -y \
+apache2 \
 apache2-bin \
-libapache2-mod-php5 \
-php5-curl \
-php5-ldap \
-php5-mysql \
-php5-mcrypt \
-php5-gd \
+libapache2-mod-php7.0 \
+php7.0-curl \
+php7.0-ldap \
+php7.0-mysql \
+php7.0-mcrypt \
+php7.0-gd \
+php7.0-xml \
+php7.0-mbstring \
+php7.0-zip \
+php7.0-bcmath \
 patch \
 curl \
 vim \
 git \
-mysql-client
+mysql-client \
+&& apt-get clean \
+&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

-RUN php5enmod mcrypt
-RUN php5enmod gd
+RUN phpenmod mcrypt
+RUN phpenmod gd
+RUN phpenmod bcmath

-RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php5/apache2/php.ini
-RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php5/cli/php.ini
+RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/7.0/apache2/php.ini
+RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/7.0/cli/php.ini

-RUN useradd --uid 1000 --gid 50 docker
+RUN useradd -m --uid 1000 --gid 50 docker

 RUN echo export APACHE_RUN_USER=docker >> /etc/apache2/envvars
 RUN echo export APACHE_RUN_GROUP=staff >> /etc/apache2/envvars
@@ -55,7 +63,6 @@ RUN chown -R docker /var/www/html

 RUN \
 	rm -r "/var/www/html/storage/private_uploads" && ln -fs "/var/lib/snipeit/data/private_uploads" "/var/www/html/storage/private_uploads" \
-      && mkdir -p "/var/lib/snipeit/data/uploads/{assets,avatars,barcodes,models,suppliers}" \
      && rm -rf "/var/www/html/public/uploads" && ln -fs "/var/lib/snipeit/data/uploads" "/var/www/html/public/uploads" \
      && rm -r "/var/www/html/storage/app/backups" && ln -fs "/var/lib/snipeit/dumps" "/var/www/html/storage/app/backups"

@@ -65,7 +72,9 @@ RUN \
 RUN cd /tmp;curl -sS https://getcomposer.org/installer | php;mv /tmp/composer.phar /usr/local/bin/composer

 # Get dependencies
-RUN cd /var/www/html;composer install
+USER docker
+RUN cd /var/www/html;composer install && rm -rf /home/docker/.composer/cache
+USER root

 ############### APPLICATION INSTALL/INIT #################

@@ -85,7 +94,13 @@ VOLUME ["/var/lib/snipeit"]
 COPY docker/entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh

-ENTRYPOINT ["/entrypoint.sh"]
+# Add Tini
+ENV TINI_VERSION v0.14.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
+RUN chmod +x /tini
+ENTRYPOINT ["/tini", "--"]
+
+CMD ["/entrypoint.sh"]

 EXPOSE 80
 EXPOSE 443
--- a/README.md
+++ b/README.md
@@ -1,11 +1,12 @@
-[![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&amp;title=Ready+for+development)](http://waffle.io/snipe/snipe-it) [![Maintenance](https://img.shields.io/maintenance/yes/2016.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&amp;utm_medium=referral&amp;utm_content=snipe/snipe-it&amp;utm_campaign=Badge_Grade)
+[![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&amp;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&amp;utm_medium=referral&amp;utm_content=snipe/snipe-it&amp;utm_campaign=Badge_Grade)
+[![All Contributors](https://img.shields.io/badge/all_contributors-78-orange.svg?style=flat-square)](#contributors)


 ## Snipe-IT - Open Source Asset Management System

 This is a FOSS project for asset management in IT Operations. Knowing who has which laptop, when it was purchased in order to depreciate it correctly, handling software licenses, etc.

-It is built on [Laravel 5.2](http://laravel.com).
+It is built on [Laravel 5.4](http://laravel.com).

 Snipe-IT is actively developed and we're [releasing quite frequently](https://github.com/snipe/snipe-it/releases). ([Check out the live demo here](https://snipeitapp.com/demo/).)

@@ -21,12 +22,14 @@ If you're having trouble with the installation, please check the [Common Issues]

 -----
 ### User's Manual
-For help using Snipe-IT, check out the [user's manual](https://snipe-it-manual.readme.io/docs).
+For help using Snipe-IT, check out the [user's manual](https://snipe-it.readme.io/docs/overview).

 -----
 ### Bug Reports & Feature Requests

-Feel free to check out the [GitHub Issues for this project](https://github.com/snipe/snipe-it/issues) to open a bug report or see what open issues you can help with. Please search through existing issues (open and closed) to see if your question hasn't already been answered before opening a new issue.
+Feel free to check out the [GitHub Issues for this project](https://github.com/snipe/snipe-it/issues) to open a bug report or see what open issues you can help with. Please search through existing issues (open *and* closed) to see if your question has already been answered before opening a new issue.
+
+**PLEASE see the [Getting Help Guidelines](https://snipe-it.readme.io/docs/getting-help) and [Common Issues](https://snipe-it.readme.io/docs/common-issues) before opening a ticket, and be sure to complete all of the questions in the Github Issue template to help us to help you as quickly as possible.**

 -----

@@ -47,6 +50,30 @@ Please see the [translations documentation](https://snipe-it.readme.io/docs/tran

 -----

+### Contributors
+
+Thanks goes to all of these wonderful people ([emoji key](https://github.com/kentcdodds/all-contributors#emoji-key)) who have helped Snipe-IT get this far:
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+| [<img src="https://avatars3.githubusercontent.com/u/197404?v=3" width="110px;"/><br /><sub>snipe</sub>](http://www.snipe.net)<br />[💻](https://github.com/snipe/snipe-it/commits?author=snipe "Code") [🚇](#infra-snipe "Infrastructure (Hosting, Build-Tools, etc)") [📖](https://github.com/snipe/snipe-it/commits?author=snipe "Documentation") [⚠️](https://github.com/snipe/snipe-it/commits?author=snipe "Tests") [🐛](https://github.com/snipe/snipe-it/issues?q=author%3Asnipe "Bug reports") [🎨](#design-snipe "Design") [👀](#review-snipe "Reviewed Pull Requests") | [<img src="https://avatars0.githubusercontent.com/u/36335?v=3" width="110px;"/><br /><sub>Brady Wetherington</sub>](http://www.uberbrady.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=uberbrady "Code") [📖](https://github.com/snipe/snipe-it/commits?author=uberbrady "Documentation") [🚇](#infra-uberbrady "Infrastructure (Hosting, Build-Tools, etc)") [👀](#review-uberbrady "Reviewed Pull Requests") | [<img src="https://avatars0.githubusercontent.com/u/3803132?v=3" width="110px;"/><br /><sub>Daniel Meltzer</sub>](https://github.com/dmeltzer)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dmeltzer "Code") [⚠️](https://github.com/snipe/snipe-it/commits?author=dmeltzer "Tests") [📖](https://github.com/snipe/snipe-it/commits?author=dmeltzer "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/1609106?v=3" width="110px;"/><br /><sub>Michael T</sub>](http://www.tuckertechonline.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mtucker6784 "Code") | [<img src="https://avatars2.githubusercontent.com/u/3274937?v=3" width="110px;"/><br /><sub>madd15</sub>](https://github.com/madd15)<br />[📖](https://github.com/snipe/snipe-it/commits?author=madd15 "Documentation") [💬](#question-madd15 "Answering Questions") | [<img src="https://avatars2.githubusercontent.com/u/894126?v=3" width="110px;"/><br /><sub>Vincent Sposato</sub>](https://github.com/vsposato)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vsposato "Code") | [<img src="https://avatars0.githubusercontent.com/u/1639757?v=3" width="110px;"/><br /><sub>Andrea Bergamasco</sub>](https://github.com/vjandrea)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vjandrea "Code") |
+| :---: | :---: | :---: | :---: | :---: | :---: | :---: |
+| [<img src="https://avatars0.githubusercontent.com/u/10640152?v=3" width="110px;"/><br /><sub>Karol</sub>](https://github.com/kpawelski)<br />[🌍](#translation-kpawelski "Translation") [💻](https://github.com/snipe/snipe-it/commits?author=kpawelski "Code") | [<img src="https://avatars3.githubusercontent.com/u/600106?v=3" width="110px;"/><br /><sub>morph027</sub>](http://blog.morph027.de/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=morph027 "Code") | [<img src="https://avatars3.githubusercontent.com/u/22935755?v=3" width="110px;"/><br /><sub>fvleminckx</sub>](https://github.com/fvleminckx)<br />[🚇](#infra-fvleminckx "Infrastructure (Hosting, Build-Tools, etc)") | [<img src="https://avatars2.githubusercontent.com/u/15633547?v=3" width="110px;"/><br /><sub>itsupportcmsukorg</sub>](https://github.com/itsupportcmsukorg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=itsupportcmsukorg "Code") [🐛](https://github.com/snipe/snipe-it/issues?q=author%3Aitsupportcmsukorg "Bug reports") | [<img src="https://avatars3.githubusercontent.com/u/12373799?v=3" width="110px;"/><br /><sub>Frank</sub>](https://override.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=base-zero "Code") | [<img src="https://avatars0.githubusercontent.com/u/10137?v=3" width="110px;"/><br /><sub>Deleted user</sub>](https://github.com/ghost)<br />[🌍](#translation-ghost "Translation") | [<img src="https://avatars1.githubusercontent.com/u/10802313?v=3" width="110px;"/><br /><sub>tiagom62</sub>](https://github.com/tiagom62)<br />[💻](https://github.com/snipe/snipe-it/commits?author=tiagom62 "Code") [🚇](#infra-tiagom62 "Infrastructure (Hosting, Build-Tools, etc)") |
+| [<img src="https://avatars3.githubusercontent.com/u/2389047?v=3" width="110px;"/><br /><sub>Ryan Stafford</sub>](https://github.com/rystaf)<br />[💻](https://github.com/snipe/snipe-it/commits?author=rystaf "Code") | [<img src="https://avatars2.githubusercontent.com/u/10345935?v=3" width="110px;"/><br /><sub>Eammon Hanlon</sub>](https://github.com/ehanlon)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ehanlon "Code") | [<img src="https://avatars0.githubusercontent.com/u/441924?v=3" width="110px;"/><br /><sub>zjean</sub>](https://github.com/zjean)<br />[💻](https://github.com/snipe/snipe-it/commits?author=zjean "Code") | [<img src="https://avatars0.githubusercontent.com/u/12660103?v=3" width="110px;"/><br /><sub>Matthias Frei</sub>](http://www.frei.media)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FREImedia "Code") | [<img src="https://avatars0.githubusercontent.com/u/3767518?v=3" width="110px;"/><br /><sub>opsydev</sub>](https://github.com/opsydev)<br />[💻](https://github.com/snipe/snipe-it/commits?author=opsydev "Code") | [<img src="https://avatars1.githubusercontent.com/u/82290?v=3" width="110px;"/><br /><sub>Daniel Dreier</sub>](http://www.ddreier.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ddreier "Code") | [<img src="https://avatars0.githubusercontent.com/u/23448?v=3" width="110px;"/><br /><sub>Nikolai Prokoschenko</sub>](http://rassie.org)<br />[💻](https://github.com/snipe/snipe-it/commits?author=rassie "Code") |
+| [<img src="https://avatars0.githubusercontent.com/u/13452757?v=3" width="110px;"/><br /><sub>Drew</sub>](https://github.com/YetAnotherCodeMonkey)<br />[💻](https://github.com/snipe/snipe-it/commits?author=YetAnotherCodeMonkey "Code") | [<img src="https://avatars0.githubusercontent.com/u/1342320?v=3" width="110px;"/><br /><sub>Walter</sub>](https://github.com/merid14)<br />[💻](https://github.com/snipe/snipe-it/commits?author=merid14 "Code") | [<img src="https://avatars3.githubusercontent.com/u/11254614?v=3" width="110px;"/><br /><sub>Petr Baloun</sub>](https://github.com/balous)<br />[💻](https://github.com/snipe/snipe-it/commits?author=balous "Code") | [<img src="https://avatars0.githubusercontent.com/u/6117660?v=3" width="110px;"/><br /><sub>reidblomquist</sub>](https://github.com/reidblomquist)<br />[📖](https://github.com/snipe/snipe-it/commits?author=reidblomquist "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/539914?v=3" width="110px;"/><br /><sub>Mathieu Kooiman</sub>](https://github.com/mathieuk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mathieuk "Code") | [<img src="https://avatars3.githubusercontent.com/u/6606421?v=3" width="110px;"/><br /><sub>csayre</sub>](https://github.com/csayre)<br />[📖](https://github.com/snipe/snipe-it/commits?author=csayre "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/768488?v=3" width="110px;"/><br /><sub>Adam Dunson</sub>](https://github.com/adamdunson)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adamdunson "Code") |
+| [<img src="https://avatars0.githubusercontent.com/u/5547470?v=3" width="110px;"/><br /><sub>Hereward</sub>](https://github.com/thehereward)<br />[💻](https://github.com/snipe/snipe-it/commits?author=thehereward "Code") | [<img src="https://avatars0.githubusercontent.com/u/5802977?v=3" width="110px;"/><br /><sub>swoopdk</sub>](https://github.com/swoopdk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=swoopdk "Code") | [<img src="https://avatars1.githubusercontent.com/u/3470403?v=3" width="110px;"/><br /><sub>Abdullah Alansari</sub>](https://linkedin.com/in/ahimta)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Ahimta "Code") | [<img src="https://avatars0.githubusercontent.com/u/796443?v=3" width="110px;"/><br /><sub>Micael Rodrigues</sub>](https://github.com/MicaelRodrigues)<br />[💻](https://github.com/snipe/snipe-it/commits?author=MicaelRodrigues "Code") | [<img src="https://avatars0.githubusercontent.com/u/614564?v=3" width="110px;"/><br /><sub>Patrick Gallagher</sub>](http://macadmincorner.com)<br />[📖](https://github.com/snipe/snipe-it/commits?author=patgmac "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/7165922?v=3" width="110px;"/><br /><sub>Miliamber</sub>](https://github.com/Miliamber)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Miliamber "Code") | [<img src="https://avatars3.githubusercontent.com/u/861766?v=3" width="110px;"/><br /><sub>hawk554</sub>](https://github.com/hawk554)<br />[💻](https://github.com/snipe/snipe-it/commits?author=hawk554 "Code") |
+| [<img src="https://avatars1.githubusercontent.com/u/1695622?v=3" width="110px;"/><br /><sub>Justin Kerr</sub>](http://jbirdkerr.net)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jbirdkerr "Code") | [<img src="https://avatars3.githubusercontent.com/u/11426176?v=3" width="110px;"/><br /><sub>Ira W. Snyder</sub>](http://www.irasnyder.com/devel/)<br />[📖](https://github.com/snipe/snipe-it/commits?author=irasnyd "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/2475759?v=3" width="110px;"/><br /><sub>Aladin Alaily</sub>](https://github.com/aalaily)<br />[💻](https://github.com/snipe/snipe-it/commits?author=aalaily "Code") | [<img src="https://avatars0.githubusercontent.com/u/10247644?v=3" width="110px;"/><br /><sub>Chase Hansen</sub>](https://github.com/kobie-chasehansen)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kobie-chasehansen "Code") [💬](#question-kobie-chasehansen "Answering Questions") [🐛](https://github.com/snipe/snipe-it/issues?q=author%3Akobie-chasehansen "Bug reports") | [<img src="https://avatars2.githubusercontent.com/u/13545400?v=3" width="110px;"/><br /><sub>IDM Helpdesk</sub>](https://github.com/IDM-Helpdesk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=IDM-Helpdesk "Code") | [<img src="https://avatars2.githubusercontent.com/u/614439?v=3" width="110px;"/><br /><sub>Kai</sub>](http://balticer.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=balticer "Code") | [<img src="https://avatars1.githubusercontent.com/u/8762511?v=3" width="110px;"/><br /><sub>Michael Daniels</sub>](http://www.michaeldaniels.me)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mdaniels5757 "Code") |
+| [<img src="https://avatars3.githubusercontent.com/u/1532660?v=3" width="110px;"/><br /><sub>Tom Castleman</sub>](http://tomcastleman.me)<br />[💻](https://github.com/snipe/snipe-it/commits?author=tomcastleman "Code") | [<img src="https://avatars3.githubusercontent.com/u/10723243?v=3" width="110px;"/><br /><sub>Daniel Nemanic</sub>](https://github.com/DanielNemanic)<br />[💻](https://github.com/snipe/snipe-it/commits?author=DanielNemanic "Code") | [<img src="https://avatars0.githubusercontent.com/u/150648?v=3" width="110px;"/><br /><sub>SouthWolf</sub>](https://github.com/southwolf)<br />[💻](https://github.com/snipe/snipe-it/commits?author=southwolf "Code") | [<img src="https://avatars2.githubusercontent.com/u/131616?v=3" width="110px;"/><br /><sub>Ivar Nesje</sub>](https://github.com/ivarne)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ivarne "Code") | [<img src="https://avatars1.githubusercontent.com/u/62333?v=3" width="110px;"/><br /><sub>Jérémy Benoist</sub>](http://www.j0k3r.net)<br />[📖](https://github.com/snipe/snipe-it/commits?author=j0k3r "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/724344?v=3" width="110px;"/><br /><sub>Chris Leathley</sub>](https://github.com/cleathley)<br />[🚇](#infra-cleathley "Infrastructure (Hosting, Build-Tools, etc)") | [<img src="https://avatars0.githubusercontent.com/u/972498?v=3" width="110px;"/><br /><sub>splaer</sub>](https://github.com/splaer)<br />[🐛](https://github.com/snipe/snipe-it/issues?q=author%3Asplaer "Bug reports") [💻](https://github.com/snipe/snipe-it/commits?author=splaer "Code") |
+| [<img src="https://avatars1.githubusercontent.com/u/967362?v=3" width="110px;"/><br /><sub>Joe Ferguson</sub>](http://www.joeferguson.me)<br />[💻](https://github.com/snipe/snipe-it/commits?author=svpernova09 "Code") | [<img src="https://avatars3.githubusercontent.com/u/6108682?v=3" width="110px;"/><br /><sub>diwanicki</sub>](https://github.com/diwanicki)<br />[💻](https://github.com/snipe/snipe-it/commits?author=diwanicki "Code") [📖](https://github.com/snipe/snipe-it/commits?author=diwanicki "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/2527115?v=3" width="110px;"/><br /><sub>Lee Thoong Ching</sub>](https://github.com/pakkua80)<br />[📖](https://github.com/snipe/snipe-it/commits?author=pakkua80 "Documentation") [💻](https://github.com/snipe/snipe-it/commits?author=pakkua80 "Code") | [<img src="https://avatars1.githubusercontent.com/u/461491?v=3" width="110px;"/><br /><sub>Marek Šuppa</sub>](http://shu.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mrshu "Code") | [<img src="https://avatars1.githubusercontent.com/u/8693762?v=3" width="110px;"/><br /><sub>Juan J. Martinez</sub>](https://github.com/mizar1616)<br />[🌍](#translation-mizar1616 "Translation") | [<img src="https://avatars1.githubusercontent.com/u/1458388?v=3" width="110px;"/><br /><sub>R Ryan Dial</sub>](https://github.com/rrdial)<br />[🌍](#translation-rrdial "Translation") | [<img src="https://avatars2.githubusercontent.com/u/2871745?v=3" width="110px;"/><br /><sub>Andrej Manduch</sub>](https://github.com/burlito)<br />[📖](https://github.com/snipe/snipe-it/commits?author=burlito "Documentation") |
+| [<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") |
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
+
+-----
+
 ### Contributing

 Please see the documentation on [contributing and developing for Snipe-IT](https://snipe-it.readme.io/docs/contributing).
@@ -54,6 +81,8 @@ Please see the documentation on [contributing and developing for Snipe-IT](https

 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.

+-----
+
 ### Security

 To report a security vulnerability, please email security@snipeitapp.com instead of using the issue tracker. 
--- a/app/Console/Commands/AssetImportCommand.php
+++ b/app/Console/Commands/AssetImportCommand.php
@@ -1,463 +0,0 @@
-<?php
-namespace App\Console\Commands;
-
-use App\Models\User;
-use App\Models\Location;
-use App\Models\Category;
-use App\Models\AssetModel;
-use App\Models\Company;
-use App\Models\Asset;
-use App\Models\Manufacturer;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Input\InputArgument;
-
-use Illuminate\Console\Command;
-use League\Csv\Reader;
-
-class AssetImportCommand extends Command
-{
-
-    /**
-     * The console command name.
-     *
-     * @var string
-     */
-    protected $name = 'snipeit:asset-import';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Import Assets from CSV';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function fire()
-    {
-        $filename = $this->argument('filename');
-
-
-        if (!$this->option('testrun')=='true') {
-            $this->comment('======= Importing Assets from '.$filename.' =========');
-        } else {
-            $this->comment('====== TEST ONLY Asset Import for '.$filename.' ====');
-            $this->comment('============== NO DATA WILL BE WRITTEN ==============');
-        }
-
-        if (! ini_get("auto_detect_line_endings")) {
-            ini_set("auto_detect_line_endings", '1');
-        }
-
-        $csv = Reader::createFromPath($this->argument('filename'));
-        $csv->setNewline("\r\n");
-        $csv->setOffset(1);
-        $duplicates = '';
-
-        // Loop through the records
-        $nbInsert = $csv->each(function ($row) use ($duplicates) {
-            $status_id = 1;
-
-            // Let's just map some of these entries to more user friendly words
-
-            // User's name
-            if (array_key_exists('0', $row)) {
-                $user_name = trim($row[0]);
-            } else {
-                $user_name = '';
-            }
-
-            // User's email
-            if (array_key_exists('1', $row)) {
-                $user_email = trim($row[1]);
-            } else {
-                $user_email = '';
-            }
-
-            // User's email
-            if (array_key_exists('2', $row)) {
-                $user_username = trim($row[2]);
-            } else {
-                $user_username = '';
-            }
-
-            // Asset Name
-            if (array_key_exists('3', $row)) {
-                $user_asset_asset_name = trim($row[3]);
-            } else {
-                $user_asset_asset_name = '';
-            }
-
-            // Asset Category
-            if (array_key_exists('4', $row)) {
-                $user_asset_category = trim($row[4]);
-            } else {
-                $user_asset_category = '';
-            }
-
-            // Asset Name
-            if (array_key_exists('5', $row)) {
-                $user_asset_name = trim($row[5]);
-            } else {
-                $user_asset_name = '';
-            }
-
-            // Asset Manufacturer
-            if (array_key_exists('6', $row)) {
-                $user_asset_mfgr = trim($row[6]);
-            } else {
-                $user_asset_mfgr = '';
-            }
-
-            // Asset model number
-            if (array_key_exists('7', $row)) {
-                $user_asset_modelno = trim($row[7]);
-            } else {
-                $user_asset_modelno = '';
-            }
-
-            // Asset serial number
-            if (array_key_exists('8', $row)) {
-                $user_asset_serial = trim($row[8]);
-            } else {
-                $user_asset_serial = '';
-            }
-
-            // Asset tag
-            if (array_key_exists('9', $row)) {
-                $user_asset_tag = trim($row[9]);
-            } else {
-                $user_asset_tag = '';
-            }
-
-            // Asset location
-            if (array_key_exists('10', $row)) {
-                $user_asset_location = trim($row[10]);
-            } else {
-                $user_asset_location = '';
-            }
-
-            // Asset notes
-            if (array_key_exists('11', $row)) {
-                $user_asset_notes = trim($row[11]);
-            } else {
-                $user_asset_notes = '';
-            }
-
-            // Asset purchase date
-            if (array_key_exists('12', $row)) {
-                if ($row[12]!='') {
-                    $user_asset_purchase_date = date("Y-m-d 00:00:01", strtotime($row[12]));
-                } else {
-                    $user_asset_purchase_date = '';
-                }
-            } else {
-                $user_asset_purchase_date = '';
-            }
-
-            // Asset purchase cost
-            if (array_key_exists('13', $row)) {
-                if ($row[13]!='') {
-                    $user_asset_purchase_cost = trim($row[13]);
-                } else {
-                    $user_asset_purchase_cost = '';
-                }
-            } else {
-                $user_asset_purchase_cost = '';
-            }
-
-       // Asset Company Name
-            if (array_key_exists('14', $row)) {
-                if ($row[14]!='') {
-                    $user_asset_company_name = trim($row[14]);
-                } else {
-                        $user_asset_company_name= '';
-                }
-            } else {
-                   $user_asset_company_name = '';
-            }
-
-
-        // A number was given instead of a name
-            if (is_numeric($user_name)) {
-                $this->comment('User '.$user_name.' is not a name - assume this user already exists');
-                $user_username = '';
-                $first_name = '';
-                $last_name = '';
-
-            // No name was given
-            } elseif ($user_name=='') {
-                $this->comment('No user data provided - skipping user creation, just adding asset');
-                $first_name = '';
-                $last_name = '';
-                //$user_username = '';
-
-            } else {
-                $user_email_array = User::generateFormattedNameFromFullName($this->option('email_format'), $user_name);
-                $first_name = $user_email_array['first_name'];
-                $last_name = $user_email_array['last_name'];
-
-                if ($user_email=='') {
-                    $user_email = $user_email_array['username'].'@'.config('app.domain');
-                }
-
-                if ($user_username=='') {
-                    if ($this->option('username_format')=='email') {
-                        $user_username = $user_email;
-                    } else {
-                        $user_name_array = User::generateFormattedNameFromFullName($this->option('username_format'), $user_name);
-                        $user_username = $user_name_array['username'];
-                    }
-
-                }
-
-            }
-
-            $this->comment('Full Name: '.$user_name);
-            $this->comment('First Name: '.$first_name);
-            $this->comment('Last Name: '.$last_name);
-            $this->comment('Username: '.$user_username);
-            $this->comment('Email: '.$user_email);
-            $this->comment('Category Name: '.$user_asset_category);
-            $this->comment('Item: '.$user_asset_name);
-            $this->comment('Manufacturer ID: '.$user_asset_mfgr);
-            $this->comment('Model No: '.$user_asset_modelno);
-            $this->comment('Serial No: '.$user_asset_serial);
-            $this->comment('Asset Tag: '.$user_asset_tag);
-            $this->comment('Location: '.$user_asset_location);
-            $this->comment('Purchase Date: '.$user_asset_purchase_date);
-            $this->comment('Purchase Cost: '.$user_asset_purchase_cost);
-            $this->comment('Notes: '.$user_asset_notes);
-            $this->comment('Company Name: '.$user_asset_company_name);
-
-            $this->comment('------------- Action Summary ----------------');
-
-            if ($user_username!='') {
-                if ($user = User::MatchEmailOrUsername($user_username, $user_email)
-                ->whereNotNull('username')->first()) {
-                    $this->comment('User '.$user_username.' already exists');
-                } else {
-                    $user = new \App\Models\User;
-                    $password  = substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 20);
-
-                    $user->first_name = $first_name;
-                    $user->last_name = $last_name;
-                    $user->username = $user_username;
-                    $user->email = $user_email;
-                    $user->permissions = '{user":1}';
-                    $user->password = bcrypt($password);
-                    $user->activated = 1;
-                    if ($user->save()) {
-                        $this->comment('User '.$first_name.' created');
-                    } else {
-                        $this->error('ERROR CREATING User '.$first_name.' '.$last_name);
-                        $this->error($user->getErrors());
-                    }
-
-                }
-            } else {
-                $user = new User;
-            }
-
-        // Check for the location match and create it if it doesn't exist
-            if ($location = Location::where('name', e($user_asset_location))->first()) {
-                $this->comment('Location '.$user_asset_location.' already exists');
-            } else {
-
-                $location = new Location();
-
-                if ($user_asset_location!='') {
-                    $location->name = e($user_asset_location);
-                    $location->address = '';
-                    $location->city = '';
-                    $location->state = '';
-                    $location->country = '';
-                    $location->user_id = 1;
-
-                    if (!$this->option('testrun')=='true') {
-
-                        if ($location->save()) {
-                            $this->comment('Location '.$user_asset_location.' was created');
-                        } else {
-                            $this->error('Something went wrong! Location '.$user_asset_location.' was NOT created');
-                            $this->error($location->getErrors());
-                        }
-
-                    } else {
-                        $this->comment('Location '.$user_asset_location.' was (not) created - test run only');
-                    }
-                } else {
-                    $this->comment('No location given, so none created.');
-                }
-
-            }
-
-            if (e($user_asset_category)=='') {
-                $category_name = 'Unnamed Category';
-            } else {
-                $category_name = e($user_asset_category);
-            }
-
-        // Check for the category match and create it if it doesn't exist
-            if ($category = Category::where('name', e($category_name))->where('category_type', 'asset')->first()) {
-                $this->comment('Category '.$category_name.' already exists');
-
-            } else {
-                $category = new Category();
-                $category->name = e($category_name);
-                $category->category_type = 'asset';
-                $category->user_id = 1;
-
-                if ($category->save()) {
-                    $this->comment('Category '.$user_asset_category.' was created');
-                } else {
-                    $this->error('Something went wrong! Category '.$user_asset_category.' was NOT created');
-                    $this->error($category->getErrors());
-                }
-
-            }
-
-        // Check for the manufacturer match and create it if it doesn't exist
-            if ($manufacturer = Manufacturer::where('name', e($user_asset_mfgr))->first()) {
-                $this->comment('Manufacturer '.$user_asset_mfgr.' already exists');
-            } else {
-                $manufacturer = new Manufacturer();
-                $manufacturer->name = e($user_asset_mfgr);
-                $manufacturer->user_id = 1;
-
-                if ($manufacturer->save()) {
-                    $this->comment('Manufacturer '.$user_asset_mfgr.' was created');
-                } else {
-                    $this->error('Something went wrong! Manufacturer '.$user_asset_mfgr.' was NOT created: '. $manufacturer->getErrors()->first());
-                }
-
-            }
-
-        // Check for the asset model match and create it if it doesn't exist
-            if ($asset_model = AssetModel::where('name', e($user_asset_name))->where('modelno', e($user_asset_modelno))->where('category_id', $category->id)->where('manufacturer_id', $manufacturer->id)->first()) {
-                $this->comment('The Asset Model '.$user_asset_name.' with model number '.$user_asset_modelno.' already exists');
-            } else {
-                $asset_model = new AssetModel();
-                $asset_model->name = e($user_asset_name);
-                $asset_model->manufacturer_id = $manufacturer->id;
-                $asset_model->modelno = e($user_asset_modelno);
-                $asset_model->category_id = $category->id;
-                $asset_model->user_id = 1;
-
-                if ($asset_model->save()) {
-                    $this->comment('Asset Model '.$user_asset_name.' with model number '.$user_asset_modelno.' was created');
-                } else {
-                    $this->error('Something went wrong! Asset Model '.$user_asset_name.' was NOT created: '.$asset_model->getErrors()->first());
-                }
-
-            }
-
-        // Check for the asset company match and create it if it doesn't exist
-            if ($user_asset_company_name!='') {
-                if ($company = Company::where('name', e($user_asset_company_name))->first()) {
-                    $this->comment('Company '.$user_asset_company_name.' already exists');
-                } else {
-                    $company = new Company();
-                    $company->name = e($user_asset_company_name);
-
-                    if ($company->save()) {
-                        $this->comment('Company '.$user_asset_company_name.' was created');
-                    } else {
-                        $this->error('Something went wrong! Company '.$user_asset_company_name.' was NOT created: '.$company->getErrors()->first());
-                    }
-                }
-
-            } else {
-                $company = new Company();
-            }
-
-            // Check for the asset match and create it if it doesn't exist
-            if ($asset = Asset::where('asset_tag', e($user_asset_tag))->first()) {
-                $this->comment('The Asset with asset tag '.$user_asset_tag.' already exists');
-            } else {
-                $asset = new Asset();
-                $asset->name = e($user_asset_asset_name);
-                if ($user_asset_purchase_date!='') {
-                    $asset->purchase_date = $user_asset_purchase_date;
-                } else {
-                    $asset->purchase_date = null;
-                }
-                if ($user_asset_purchase_cost!='') {
-                    $asset->purchase_cost = ParseFloat(e($user_asset_purchase_cost));
-                } else {
-                    $asset->purchase_cost = 0.00;
-                }
-                    $asset->serial = e($user_asset_serial);
-                    $asset->asset_tag = e($user_asset_tag);
-                    $asset->model_id = $asset_model->id;
-                    $asset->assigned_to = $user->id;
-                    $asset->rtd_location_id = $location->id;
-                    $asset->user_id = 1;
-                    $asset->status_id = $status_id;
-                    $asset->company_id = $company->id;
-                if ($user_asset_purchase_date!='') {
-                    $asset->purchase_date = $user_asset_purchase_date;
-                } else {
-                    $asset->purchase_date = null;
-                }
-                    $asset->notes = e($user_asset_notes);
-
-                if ($asset->save()) {
-                    $this->comment('Asset '.$user_asset_name.' with serial number '.$user_asset_serial.' was created');
-                } else {
-                    $this->error('Something went wrong! Asset '.$user_asset_name.' was NOT created: '.$asset->getErrors()->first());
-                }
-
-            }
-
-
-
-            $this->comment('=====================================');
-
-            return true;
-
-        });
-
-
-    }
-
-    /**
-     * Get the console command arguments.
-     *
-     * @return array
-     */
-    protected function getArguments()
-    {
-        return array(
-            array('filename', InputArgument::REQUIRED, 'File for the CSV import.'),
-        );
-    }
-
-
-    /**
-     * Get the console command options.
-     *
-     * @return array
-     */
-    protected function getOptions()
-    {
-        return array(
-        array('email_format', null, InputOption::VALUE_REQUIRED, 'The format of the email addresses that should be generated. Options are firstname.lastname, firstname, filastname', null),
-        array('username_format', null, InputOption::VALUE_REQUIRED, 'The format of the username that should be generated. Options are firstname.lastname, firstname, filastname, email', null),
-        array('testrun', null, InputOption::VALUE_REQUIRED, 'Test the output without writing to the database or not.', null),
-        );
-    }
-}
--- a/app/Console/Commands/FixDoubleEscape.php
+++ b/app/Console/Commands/FixDoubleEscape.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class FixDoubleEscape extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'snipeit:unescape';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This should be run to fix some double-escaping issues from earlier versions of Snipe-IT.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+
+        $tables = [
+            '\App\Models\Asset' => ['name'],
+            '\App\Models\License' => ['name'],
+            '\App\Models\Consumable' => ['name'],
+            '\App\Models\Accessory' => ['name'],
+            '\App\Models\Component' => ['name'],
+            '\App\Models\Company' => ['name'],
+            '\App\Models\Manufacturer' => ['name'],
+            '\App\Models\Supplier' => ['name'],
+            '\App\Models\Statuslabel' => ['name'],
+            '\App\Models\Depreciation' => ['name'],
+            '\App\Models\AssetModel' => ['name'],
+            '\App\Models\Group' => ['name'],
+            '\App\Models\Department' => ['name'],
+            '\App\Models\Location' => ['name'],
+            '\App\Models\User' => ['first_name', 'last_name'],
+        ];
+
+        $count = array();
+
+
+
+            foreach ($tables as $classname => $fields) {
+                $count[$classname] = array();
+                $count[$classname]['classname'] = 0;
+
+                foreach($fields as $field) {
+
+                    $count[$classname]['classname']++;
+                    $count[$classname][$field] = 0;
+
+                    foreach($classname::where("$field",'LIKE','%&%')->get() as $row) {
+                        $this->info('Updating '.$field.' for '.$classname);
+                        $row->{$field} = html_entity_decode($row->{$field});
+                        $row->save();
+                        $count[$classname][$field]++;
+
+                    }
+                }
+            }
+
+        $this->info('Update complete');
+
+    }
+}
--- a/app/Console/Commands/LdapSync.php
+++ b/app/Console/Commands/LdapSync.php
@@ -69,22 +69,55 @@ class LdapSync extends Command

        $results = Ldap::findLdapUsers();

+        $ldap_ou_locations = Location::whereNotNull('ldap_ou')->get();
+
+        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();
+        for ($i = 0; $i < $results["count"]; $i++) {
+            $results[$i]["ldap_location_override"] = false;
+            $results[$i]["location_id"] = 0;
+        }
+
        if ($this->option('location')!='') {
-            $location = Location::where('name','=',$this->option('location'))->first();
+            $location = Location::where('name', '=', $this->option('location'))->first();
            LOG::debug('Location name '.$this->option('location').' passed');
            LOG::debug('Importing to '.$location->name.' ('.$location->id.')');
        } elseif ($this->option('location_id')!='') {
-            $location = Location::where('id','=',$this->option('location_id'))->first();
+            $location = Location::where('id', '=', $this->option('location_id'))->first();
            LOG::debug('Location ID '.$this->option('location_id').' passed');
            LOG::debug('Importing to '.$location->name.' ('.$location->id.')');
        } else {
-            $location = new Location;
-        }
+	    $location = NULL;
+	}

        if (!isset($location)) {
-            LOG::debug('That location is invalid, so no location will be assigned.');
+            LOG::debug('That location is invalid or a location was not provided, so no location will be assigned by default.');
        }

+        // 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], $usernames)) {
+                    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);
@@ -99,6 +132,9 @@ class LdapSync extends Command
                $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"]:"";
+

                // User exists
                $item["createorupdate"] = 'updated';
@@ -118,7 +154,9 @@ class LdapSync extends Command
                $user->employee_num = e($item["employee_number"]);
                $user->activated = 1;

-                if ($location) {
+                if ($item['ldap_location_override'] == true) {
+                    $user->location_id = $item['location_id'];
+                } else if ($location) {
                    $user->location_id = e($location->id);
                }

@@ -146,7 +184,7 @@ class LdapSync extends Command
        if ($this->option('summary')) {
            for ($x = 0; $x < count($summary); $x++) {
                if ($summary[$x]['status']=='error') {
-                    $this->error('ERROR: '.$summary[$x]['firstname'].' '.$summary[$x]['lastname'].' (username:  '.$summary[$x]['username'].' was not imported: '.$summary[$x]['note'] );
+                    $this->error('ERROR: '.$summary[$x]['firstname'].' '.$summary[$x]['lastname'].' (username:  '.$summary[$x]['username'].' was not imported: '.$summary[$x]['note']);
                } else {
                    $this->info('User '.$summary[$x]['firstname'].' '.$summary[$x]['lastname'].' (username:  '.$summary[$x]['username'].' was '.strtoupper($summary[$x]['createorupdate']).'.');
                }
@@ -159,6 +197,4 @@ class LdapSync extends Command


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

 namespace App\Console\Commands;

-use Illuminate\Console\Command;
-use DB;
-
 use App\Models\Accessory;
 use App\Models\Asset;
 use App\Models\AssetModel;
@@ -12,14 +9,18 @@ use App\Models\Category;
 use App\Models\Company;
 use App\Models\Component;
 use App\Models\Consumable;
+use App\Models\Department;
 use App\Models\Depreciation;
 use App\Models\Group;
+use App\Models\Import;
 use App\Models\License;
 use App\Models\LicenseSeat;
 use App\Models\Location;
 use App\Models\Manufacturer;
 use App\Models\Statuslabel;
 use App\Models\Supplier;
+use DB;
+use Illuminate\Console\Command;

 class PaveIt extends Command
 {
@@ -63,6 +64,7 @@ class PaveIt extends Command
                Company::getQuery()->delete();
                Component::getQuery()->delete();
                Consumable::getQuery()->delete();
+                Department::getQuery()->delete();
                Depreciation::getQuery()->delete();
                License::getQuery()->delete();
                LicenseSeat::getQuery()->delete();
@@ -72,6 +74,7 @@ class PaveIt extends Command
                Statuslabel::getQuery()->delete();
                Supplier::getQuery()->delete();
                Group::getQuery()->delete();
+                Import::getQuery()->delete();

                DB::statement('delete from accessories_users');
                DB::statement('delete from asset_logs');
@@ -107,6 +110,7 @@ class PaveIt extends Command
                \DB::statement('drop table IF EXISTS custom_fields');
                \DB::statement('drop table IF EXISTS custom_fieldsets');
                \DB::statement('drop table IF EXISTS depreciations');
+                \DB::statement('drop table IF EXISTS departments');
                \DB::statement('drop table IF EXISTS groups');
                \DB::statement('drop table IF EXISTS history');
                \DB::statement('drop table IF EXISTS components');
@@ -117,6 +121,11 @@ class PaveIt extends Command
                \DB::statement('drop table IF EXISTS manufacturers');
                \DB::statement('drop table IF EXISTS models');
                \DB::statement('drop table IF EXISTS migrations');
+                \DB::statement('drop table IF EXISTS oauth_access_tokens');
+                \DB::statement('drop table IF EXISTS oauth_auth_codes');
+                \DB::statement('drop table IF EXISTS oauth_clients');
+                \DB::statement('drop table IF EXISTS oauth_personal_access_clients');
+                \DB::statement('drop table IF EXISTS oauth_refresh_tokens');
                \DB::statement('drop table IF EXISTS password_resets');
                \DB::statement('drop table IF EXISTS requested_assets');
                \DB::statement('drop table IF EXISTS requests');
@@ -126,6 +135,7 @@ class PaveIt extends Command
                \DB::statement('drop table IF EXISTS throttle');
                \DB::statement('drop table IF EXISTS users_groups');
                \DB::statement('drop table IF EXISTS users');
+                \DB::statement('drop table IF EXISTS imports');
            }
        }
    }
--- a/app/Console/Commands/Purge.php
+++ b/app/Console/Commands/Purge.php
@@ -65,7 +65,7 @@ class Purge extends Command
            $asset_maintenances = 0;

            foreach ($assets as $asset) {
-                $this->info('- Asset "'.$asset->showAssetName().'" deleted.');
+                $this->info('- Asset "'.$asset->present()->name().'" deleted.');
                $asset_assoc += $asset->assetlog()->count();
                $asset->assetlog()->forceDelete();
                $asset_maintenances += $asset->assetmaintenances()->count();
--- a/app/Console/Commands/RecryptFromMcrypt.php
+++ b/app/Console/Commands/RecryptFromMcrypt.php
@@ -0,0 +1,151 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\CustomField;
+use Illuminate\Console\Command;
+use App\LegacyEncrypter\McryptEncrypter;
+use App\Models\Setting;
+use App\Models\Asset;
+use Illuminate\Support\Facades\Storage;
+
+class RecryptFromMcrypt extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'snipeit:legacy-recrypt';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This command allows upgrading users to de-encrypt their deprecated mcrypt encrypted fields and re-encrypt them using the current OpenSSL encryption.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+
+
+        // Check and see if they have a legacy app key listed in their .env
+        // If not, we can try to use the current APP_KEY if looks like it's old
+        $legacy_key = env('LEGACY_APP_KEY');
+        $errors = array();
+
+        if (!$legacy_key) {
+            $this->error('ERROR: You do not have a LEGACY_APP_KEY set in your .env file. Please locate your old APP_KEY and ADD a line to your .env file like: LEGACY_APP_KEY=YOUR_OLD_APP_KEY');
+            return false;
+        }
+
+        // Check that the app key is 32 characters
+        if (strlen($legacy_key) == 32) {
+            $this->comment('INFO: Your LEGACY_APP_KEY is 32 characters. Okay to continue.');
+        } else {
+            $this->error('ERROR: Your LEGACY_APP_KEY is not the correct length (32 characters). Please locate your old APP_KEY and use that as your LEGACY_APP_KEY in your .env file to continue.');
+            return false;
+        }
+
+        $this->error('================================!!!! WARNING !!!!================================');
+        $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?")) {
+
+            $backup_file = 'backups/env-backups/'.'app_key-'.date('Y-m-d-gis');
+
+            try {
+                Storage::disk('local')->put($backup_file, 'APP_KEY: '.config('app.key'));
+                Storage::disk('local')->append($backup_file, 'LEGACY_APP_KEY: '.$legacy_key);
+            } catch (\Exception $e) {
+                $this->info('WARNING: Could not backup app keys');
+            }
+
+
+            $mcrypter = new McryptEncrypter($legacy_key);
+            $settings = Setting::getSettings();
+
+            if ($settings->ldap_password=='') {
+                $this->comment('INFO: No LDAP password found. Skipping... ');
+            }
+
+            $custom_fields = CustomField::where('field_encrypted','=', 1)->get();
+            $this->comment('INFO: Retrieving encrypted custom fields...');
+
+            $query = Asset::withTrashed();
+
+            foreach ($custom_fields as $custom_field) {
+                $this->comment('FIELD TO RECRYPT:  '.$custom_field->name .' ('.$custom_field->db_column.')');
+                $query->orWhereNotNull($custom_field->db_column);
+            }
+
+
+            // Get all assets with a value in any of the fields that were encrypted
+            $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) {
+
+                    // Make sure the value isn't null
+                    if ($asset->{$encrypted_field}!='') {
+                        // 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);
+                            $this->comment($decrypted_field);
+                        } catch (\Exception $e) {
+                            $errors[] = ' - ERROR: Could not decrypt field ['.$encrypted_field->name.']: '.$e->getMessage();
+                        }
+                    }
+
+                }
+                $asset->save();
+                $bar->advance();
+            }
+
+
+
+            $bar->finish();
+
+            if (count($errors) > 0) {
+                $this->comment("\n\n");
+                $this->error("The decrypter encountered some errors: \n");
+                foreach ($errors as $error) {
+                    $this->error($error);
+                }
+            }
+        }
+
+    }
+}
--- a/app/Console/Commands/SendExpirationAlerts.php
+++ b/app/Console/Commands/SendExpirationAlerts.php
@@ -55,7 +55,7 @@ class SendExpirationAlerts extends Command

        foreach ($expiring_assets as $asset) {

-            $expires = $asset->warrantee_expires();
+            $expires = $asset->present()->warrantee_expires();
            $difference =  round(abs(strtotime($expires) - strtotime($now))/86400);

            if ($difference > 30) {
@@ -64,11 +64,11 @@ class SendExpirationAlerts extends Command
                $asset_data['email_content'] .= '<tr style="background-color:#d9534f;">';
            }
            $asset_data['email_content'] .= '<td><a href="'.config('app.url').'/hardware/'.e($asset->id).'/view">';
-            $asset_data['email_content'] .= $asset->showAssetName().'</a></td><td>'.e($asset->asset_tag).'</td>';
-            $asset_data['email_content'] .= '<td>'.e($asset->warrantee_expires()).'</td>';
+            $asset_data['email_content'] .= $asset->present()->name().'</a></td><td>'.e($asset->asset_tag).'</td>';
+            $asset_data['email_content'] .= '<td>'.e($asset->present()->warrantee_expires()).'</td>';
            $asset_data['email_content'] .= '<td>'.$difference.' '.trans('mail.days').'</td>';
            $asset_data['email_content'] .= '<td>'.($asset->supplier ? e($asset->supplier->name) : '').'</td>';
-            $asset_data['email_content'] .= '<td>'.($asset->assigneduser ? e($asset->assigneduser->fullName()) : '').'</td>';
+            $asset_data['email_content'] .= '<td>'.($asset->assignedTo ? e($asset->assignedTo->present()->name()) : '').'</td>';
            $asset_data['email_content'] .= '</tr>';
        }

@@ -89,7 +89,7 @@ class SendExpirationAlerts extends Command
            } else {
                $license_data['email_content'] .= '<tr style="background-color:#d9534f;">';
            }
-                $license_data['email_content'] .= '<td><a href="'.config('app.url').'/admin/licenses/'.$license->id.'/view">';
+                $license_data['email_content'] .= '<td><a href="'.route('licenses.show', $license->id).'">';
                $license_data['email_content'] .= $license->name.'</a></td>';
                $license_data['email_content'] .= '<td>'.$license->expiration_date.'</td>';
                $license_data['email_content'] .= '<td>'.$difference.' days</td>';
--- a/app/Console/Commands/Versioning.php
+++ b/app/Console/Commands/Versioning.php
@@ -42,7 +42,7 @@ class Versioning extends Command
    {

        $versionFile = 'config/version.php';
-        $hash_version = str_replace("\n",'',shell_exec('git describe --tags'));
+        $hash_version = str_replace("\n", '', shell_exec('git describe --tags'));

        $version = explode('-', $hash_version);

@@ -52,18 +52,19 @@ class Versioning extends Command
            'build_version' => $version[1],
            'hash_version' => $version[2],
            'full_hash' => $hash_version),
-        true);
+            true
+        );


        // Construct our file content
-        $content = <<<CON
+            $content = <<<CON
 <?php
 return $array;
 CON;

        // And finally write the file and output the current version
-        \File::put($versionFile, $content);
-        $this->line('Setting version: '. config('version.app_version').' build '.config('version.build_version').' ('.config('version.hash_version').')');
+            \File::put($versionFile, $content);
+            $this->line('Setting version: '. config('version.app_version').' build '.config('version.build_version').' ('.config('version.hash_version').')');
    }

    /**
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -17,13 +17,14 @@ class Kernel extends ConsoleKernel
        Commands\CreateAdmin::class,
        Commands\SendExpirationAlerts::class,
        Commands\SendInventoryAlerts::class,
-        Commands\LicenseImportCommand::class,
        Commands\ObjectImportCommand::class,
        Commands\Versioning::class,
        Commands\SystemBackup::class,
        Commands\DisableLDAP::class,
        Commands\Purge::class,
        Commands\LdapSync::class,
+        Commands\FixDoubleEscape::class,
+        Commands\RecryptFromMcrypt::class
    ];

    /**
@@ -40,4 +41,9 @@ class Kernel extends ConsoleKernel
        $schedule->command('snipeit:backup')->weekly();
        $schedule->command('backup:clean')->daily();
    }
+
+    protected function commands()
+    {
+        require base_path('routes/console.php');
+    }
 }
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -3,11 +3,10 @@
 namespace App\Exceptions;

 use Exception;
-use Illuminate\Validation\ValidationException;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Symfony\Component\HttpKernel\Exception\HttpException;
+use Illuminate\Auth\AuthenticationException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use App\Helpers\Helper;
+use Illuminate\Validation\ValidationException;

 class Handler extends ExceptionHandler
 {
@@ -17,10 +16,12 @@ class Handler extends ExceptionHandler
     * @var array
     */
    protected $dontReport = [
-        AuthorizationException::class,
-        HttpException::class,
-        ModelNotFoundException::class,
-        ValidationException::class,
+        \Illuminate\Auth\AuthenticationException::class,
+        \Illuminate\Auth\Access\AuthorizationException::class,
+        \Symfony\Component\HttpKernel\Exception\HttpException::class,
+        \Illuminate\Database\Eloquent\ModelNotFoundException::class,
+        \Illuminate\Session\TokenMismatchException::class,
+        \Illuminate\Validation\ValidationException::class,
    ];

    /**
@@ -28,12 +29,12 @@ class Handler extends ExceptionHandler
     *
     * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
     *
-     * @param  \Exception  $e
+     * @param  \Exception  $exception
     * @return void
     */
-    public function report(Exception $e)
+    public function report(Exception $exception)
    {
-        parent::report($e);
+        parent::report($exception);
    }

    /**
@@ -45,23 +46,71 @@ class Handler extends ExceptionHandler
     */
    public function render($request, Exception $e)
    {
+
+
+        // CSRF token mismatch error
        if ($e instanceof \Illuminate\Session\TokenMismatchException) {
-          return redirect()->back()->with('error', trans('general.token_expired'));
+            return redirect()->back()->with('error', trans('general.token_expired'));
        }

-        if ($this->isHttpException($e)) {

-        $statusCode = $e->getStatusCode();
+        // Handle Ajax requests that fail because the model doesn't exist
+        if ($request->ajax() || $request->wantsJson()) {

-        switch ($statusCode) {
+            if ($e instanceof \Illuminate\Database\Eloquent\ModelNotFoundException) {
+                $className = last(explode('\\', $e->getModel()));
+                return response()->json(Helper::formatStandardApiResponse('error', null, $className . ' not found'), 200);
+            }

-            case '404':
-              return response()->view('layouts/basic', [
-                  'content' => view('errors/404')
-              ]);
-          }
+            if ($e instanceof \Illuminate\Validation\ValidationException) {
+                return response()->json(Helper::formatStandardApiResponse('error', $e->response['messages'], $e->getMessage(), 400));
+            }
+
+            if ($this->isHttpException($e)) {
+
+                $statusCode = $e->getStatusCode();
+
+                switch ($e->getStatusCode()) {
+                    case '404':
+                       return response()->json(Helper::formatStandardApiResponse('error', null, $statusCode . ' endpoint not found'), 404);
+                    case '405':
+                        return response()->json(Helper::formatStandardApiResponse('error', null, 'Method not allowed'), 405);
+                    default:
+                        return response()->json(Helper::formatStandardApiResponse('error', null, $statusCode), 405);
+
+                }
+            }
+            // Try to parse 500 Errors ina  bit nicer way when debug is enabled.
+            if (config('app.debug')) {
+                return response()->json(Helper::formatStandardApiResponse('error', null, "An Error has occured! " . $e->getMessage()), 500);
+            }
+
+        }
+
+
+        if ($this->isHttpException($e) && (isset($statusCode)) && ($statusCode == '404' )) {
+            return response()->view('layouts/basic', [
+                'content' => view('errors/404')
+            ],$statusCode);
        }

        return parent::render($request, $e);
+
+    }
+
+    /**
+     * Convert an authentication exception into an unauthenticated response.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Auth\AuthenticationException  $exception
+     * @return \Illuminate\Http\Response
+     */
+    protected function unauthenticated($request, AuthenticationException $exception)
+    {
+        if ($request->expectsJson()) {
+            return response()->json(['error' => 'Unauthorized.'], 401);
+        }
+
+        return redirect()->guest('login');
    }
 }
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -4,6 +4,7 @@ namespace App\Helpers;
 use DB;
 use App\Models\Statuslabel;
 use App\Models\Location;
+use App\Models\Department;
 use App\Models\AssetModel;
 use App\Models\Company;
 use App\Models\User;
@@ -17,6 +18,7 @@ use App\Models\Component;
 use App\Models\Accessory;
 use App\Models\Consumable;
 use App\Models\Asset;
+use App\Models\Setting;
 use Crypt;
 use Illuminate\Contracts\Encryption\DecryptException;

@@ -31,7 +33,8 @@ class Helper
     * @since [v2.0]
     * @return String
     */
-    public static function parseEscapedMarkedown($str) {
+    public static function parseEscapedMarkedown($str)
+    {
        $Parsedown = new \Parsedown();

        if ($str) {
@@ -123,6 +126,8 @@ class Helper
        $LocaleInfo = localeconv();
        $floatString = str_replace(",", "", $floatString);
        $floatString = str_replace($LocaleInfo["decimal_point"], ".", $floatString);
+        // Strip Currency symbol
+        $floatString = str_replace($LocaleInfo['currency_symbol'], '', $floatString);
        return floatval($floatString);
    }

@@ -139,7 +144,7 @@ class Helper
        $models = AssetModel::with('manufacturer')->get();
        $model_array[''] = trans('general.select_model');
        foreach ($models as $model) {
-            $model_array[$model->id] = $model->displayModelName();
+            $model_array[$model->id] = $model->present()->modelName();
        }
        return $model_array;
    }
@@ -153,9 +158,10 @@ class Helper
     */
    public static function companyList()
    {
-        $company_list = array('0' => trans('general.select_company')) + DB::table('companies')
+        $company_list = array('' => trans('general.select_company')) + DB::table('companies')
                ->orderBy('name', 'asc')
-                ->pluck('name', 'id');
+                ->pluck('name', 'id')
+                ->toArray();
        return $company_list;
    }

@@ -172,12 +178,32 @@ class Helper
        $categories = Category::orderBy('name', 'asc')
                ->whereNull('deleted_at')
                ->orderBy('name', 'asc');
-        if(!empty($category_type))
+        if (!empty($category_type)) {
            $categories = $categories->where('category_type', '=', $category_type);
+        }
        $category_list = array('' => trans('general.select_category')) + $categories->pluck('name', 'id')->toArray();
        return $category_list;
    }

+
+    /**
+     * Get the list of categories in an array to make a dropdown menu
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v2.5]
+     * @return Array
+     */
+    public static function departmentList()
+    {
+        $departments = Department::orderBy('name', 'asc')
+            ->whereNull('deleted_at')
+            ->orderBy('name', 'asc');
+
+        return array('' => trans('general.select_department')) + $departments->pluck('name', 'id')->toArray();
+
+    }
+    
+
    /**
     * Get the list of suppliers in an array to make a dropdown menu
     *
@@ -203,7 +229,7 @@ class Helper
     */
    public static function statusLabelList()
    {
-        $statuslabel_list = array('' => trans('general.select_statuslabel')) + Statuslabel::orderBy('name', 'asc')
+        $statuslabel_list = array('' => trans('general.select_statuslabel')) + Statuslabel::orderBy('deployable', 'desc')
                ->pluck('name', 'id')->toArray();
        return $statuslabel_list;
    }
@@ -248,7 +274,12 @@ class Helper
     */
    public static function statusTypeList()
    {
-        $statuslabel_types = array('' => trans('admin/hardware/form.select_statustype')) + array('undeployable' => trans('admin/hardware/general.undeployable')) + array('pending' => trans('admin/hardware/general.pending')) + array('archived' => trans('admin/hardware/general.archived')) + array('deployable' => trans('admin/hardware/general.deployable'));
+        $statuslabel_types =
+              array('' => trans('admin/hardware/form.select_statustype'))
+            + array('deployable' => trans('admin/hardware/general.deployable'))
+            + array('pending' => trans('admin/hardware/general.pending'))
+            + array('undeployable' => trans('admin/hardware/general.undeployable'))
+            + array('archived' => trans('admin/hardware/general.archived'));
        return $statuslabel_types;
    }

@@ -265,7 +296,7 @@ class Helper
                        User::where('deleted_at', '=', null)
                        ->orderBy('last_name', 'asc')
                        ->orderBy('first_name', 'asc')->get()
-                        ->lists('complete_name', 'id')->toArray();
+                        ->pluck('complete_name', 'id')->toArray();

        return $manager_list;
    }
@@ -308,10 +339,10 @@ class Helper
    {
        $users_list =   array( '' => trans('general.select_user')) +
                        Company::scopeCompanyables(User::where('deleted_at', '=', null))
-                        ->where('show_in_list','=',1)
+                        ->where('show_in_list', '=', 1)
                        ->orderBy('last_name', 'asc')
                        ->orderBy('first_name', 'asc')->get()
-                        ->lists('complete_name', 'id')->toArray();
+                        ->pluck('complete_name', 'id')->toArray();

        return $users_list;
    }
@@ -336,11 +367,11 @@ class Helper
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v2.5]
-     * @return Array
+     * @return array
     */
    public static function detailedAssetList()
    {
-        $assets = array('' => trans('general.select_asset')) + Company::scopeCompanyables(Asset::with('assignedUser', 'model'), 'assets.company_id')->get()->lists('detailed_name', 'id')->toArray();
+        $assets = array('' => trans('general.select_asset')) + Company::scopeCompanyables(Asset::with('assignedTo', 'model'), 'assets.company_id')->get()->pluck('detailed_name', 'id')->toArray();
        return $assets;
    }

@@ -367,8 +398,8 @@ class Helper
     */
    public static function predefined_formats()
    {
-        $keys=array_keys(CustomField::$PredefinedFormats);
-        $stuff=array_combine($keys, $keys);
+        $keys = array_keys(CustomField::$PredefinedFormats);
+        $stuff = array_combine($keys, $keys);
        return $stuff+["" => trans('admin/custom_fields/general.custom_format')];
    }

@@ -553,7 +584,7 @@ class Helper
                if ($permission[$x]['display'] === true) {

                    if ($selected_arr) {
-                        if (array_key_exists($permission_name,$selected_arr)) {
+                        if (array_key_exists($permission_name, $selected_arr)) {
                            $permissions_arr[$permission_name] = $selected_arr[$permission_name];
                        } else {
                            $permissions_arr[$permission_name] = '0';
@@ -584,7 +615,8 @@ class Helper
     * @since [v3.0]
     * @return boolean
     */
-    public static function checkIfRequired($class, $field) {
+    public static function checkIfRequired($class, $field)
+    {
        $rules = $class::rules();
        foreach ($rules as $rule_name => $rule) {
            if ($rule_name == $field) {
@@ -611,28 +643,10 @@ class Helper
     */
    public static function array_smart_fetch(array $array, $key, $default = '')
    {
-       array_change_key_case($array, CASE_LOWER);
+        array_change_key_case($array, CASE_LOWER);
        return array_key_exists(strtolower($key), array_change_key_case($array)) ? e(trim($array[ $key ])) : $default;
    }

-    /**
-     * Check to see if the given key exists in the array, and trim excess white space before returning it
-     *
-     * @author A. Gianotto
-     * @since 3.2
-     * @param $array array
-     * @return string
-     */
-    public static function getLastDateFromHistoryArray(array $array)
-    {
-        foreach ($array as $key => $value) {
-//            echo '<pre>';
-//            echo 'last:'.$key;
-//            print_r($array);
-//            echo '</pre>';
-        }
-    }
-

    /**
     * Gracefully handle decrypting the legacy data (encrypted via mcrypt) and use the new
@@ -646,7 +660,8 @@ class Helper
     * @param String $string
     * @return string
     */
-    public static function gracefulDecrypt(CustomField $field, $string) {
+    public static function gracefulDecrypt(CustomField $field, $string)
+    {

        if ($field->isFieldDecryptable($string)) {

@@ -663,26 +678,53 @@ class Helper

    }

-    /**
-     * Strip HTML out of returned JSON. This is pretty gross, and I'd like to find a better way
-     * to handle this, but the REST API will solve some of these problems anyway.
-     *
-     * This is not currently used, but will be.
-     *
-     * @author A. Gianotto
-     * @since 3.4
-     * @param $array array
-     * @return Array
-     */
-    public static function stripTagsFromJSON(Array $array) {

-        foreach ($array as $key => $value) {
-            $clean_value = strip_tags($value);
-            $clean_array[$key] = $clean_value;
+
+    public static function formatStandardApiResponse($status, $payload = null, $messages = null) {
+
+        $array['status'] = $status;
+        ($payload) ? $array['payload'] = $payload : '';
+
+        if (($messages) && (count($messages) > 0)) {
+            $array['messages'] = $messages;
        }
-        return $clean_array;
+
+        return $array;
+    }
+
+
+    /*
+    Possible solution for unicode fieldnames
+    */
+    public static function make_slug($string) {
+        return preg_replace('/\s+/u', '_', trim($string));
+    }
+
+
+    public static function getFormattedDateObject($date, $type = 'datetime', $array = true) {
+
+        if ($date=='') {
+            return null;
+        }
+
+        $settings = Setting::getSettings();
+        $tmp_date = new \Carbon($date);
+
+        if ($type == 'datetime') {
+            $dt['datetime'] = $tmp_date->format('Y-m-d H:i:s');
+            $dt['formatted'] = $tmp_date->format($settings->date_display_format .' '. $settings->time_display_format);
+        } else {
+            $dt['date'] = $tmp_date->format('Y-m-d');
+            $dt['formatted'] = $tmp_date->format($settings->date_display_format);
+        }
+
+        if ($array == 'true') {
+            return $dt;
+        }
+        return $dt['formatted'];

    }


+
 }
--- a/app/Http/Controllers/AccessoriesController.php
+++ b/app/Http/Controllers/AccessoriesController.php
@@ -3,9 +3,7 @@ namespace App\Http\Controllers;

 use App\Helpers\Helper;
 use App\Models\Accessory;
-use App\Models\Actionlog;
 use App\Models\Company;
-use App\Models\Setting;
 use App\Models\User;
 use Auth;
 use Carbon\Carbon;
@@ -16,7 +14,7 @@ use Input;
 use Lang;
 use Mail;
 use Redirect;
-use Request;
+use Illuminate\Http\Request;
 use Slack;
 use Str;
 use View;
@@ -38,9 +36,10 @@ class AccessoriesController extends Controller
    * @since [v1.0]
    * @return View
    */
-    public function getIndex(Request $request)
+    public function index(Request $request)
    {
-        return View::make('accessories/index');
+        $this->authorize('index', Accessory::class);
+        return view('accessories/index');
    }


@@ -50,10 +49,11 @@ class AccessoriesController extends Controller
   * @author [A. Gianotto] [<snipe@snipe.net>]
   * @return View
   */
-    public function getCreate(Request $request)
+    public function create(Request $request)
    {
+        $this->authorize('create', Accessory::class);
        // Show the page
-        return View::make('accessories/edit')
+        return view('accessories/edit')
          ->with('item', new Accessory)
          ->with('category_list', Helper::categoryList('accessory'))
          ->with('company_list', Helper::companyList())
@@ -68,45 +68,31 @@ class AccessoriesController extends Controller
   * @author [A. Gianotto] [<snipe@snipe.net>]
   * @return Redirect
   */
-    public function postCreate(Request $request)
+    public function store(Request $request)
    {
-
+        $this->authorize(Accessory::class);
        // create a new model instance
        $accessory = new Accessory();

        // Update the accessory data
-        $accessory->name                    = e(Input::get('name'));
-        $accessory->category_id             = e(Input::get('category_id'));
-        $accessory->location_id             = e(Input::get('location_id'));
-        $accessory->min_amt                 = e(Input::get('min_amt'));
-        $accessory->company_id              = Company::getIdForCurrentUser(Input::get('company_id'));
-        $accessory->order_number            = e(Input::get('order_number'));
-        $accessory->manufacturer_id         = e(Input::get('manufacturer_id'));
-        $accessory->model_number            = e(Input::get('model_number'));
-
-        if (e(Input::get('purchase_date')) == '') {
-            $accessory->purchase_date       =  null;
-        } else {
-            $accessory->purchase_date       = e(Input::get('purchase_date'));
-        }
-
-        if (e(Input::get('purchase_cost')) == '0.00') {
-            $accessory->purchase_cost       =  null;
-        } else {
-            $accessory->purchase_cost       = Helper::ParseFloat(e(Input::get('purchase_cost')));
-        }
-
-        $accessory->qty                     = e(Input::get('qty'));
+        $accessory->name                    = request('name');
+        $accessory->category_id             = request('category_id');
+        $accessory->location_id             = request('location_id');
+        $accessory->min_amt                 = request('min_amt');
+        $accessory->company_id              = Company::getIdForCurrentUser(request('company_id'));
+        $accessory->order_number            = request('order_number');
+        $accessory->manufacturer_id         = request('manufacturer_id');
+        $accessory->model_number            = request('model_number');
+        $accessory->purchase_date           = request('purchase_date');
+        $accessory->purchase_cost           = Helper::ParseFloat(request('purchase_cost'));
+        $accessory->qty                     = request('qty');
        $accessory->user_id                 = Auth::user()->id;

        // Was the accessory created?
        if ($accessory->save()) {
-            $accessory->logCreate();
            // Redirect to the new accessory  page
-            return redirect()->to("admin/accessories")->with('success', trans('admin/accessories/message.create.success'));
+            return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.create.success'));
        }
-
-
        return redirect()->back()->withInput()->withErrors($accessory->getErrors());
    }

@@ -117,17 +103,16 @@ class AccessoriesController extends Controller
   * @param  int  $accessoryId
   * @return View
   */
-    public function getEdit(Request $request, $accessoryId = null)
+    public function edit(Request $request, $accessoryId = null)
    {
        // Check if the accessory exists
        if (is_null($item = Accessory::find($accessoryId))) {
-            // Redirect to the blogs management page
-            return redirect()->to('admin/accessories')->with('error', trans('admin/accessories/message.does_not_exist'));
-        } elseif (!Company::isCurrentUserHasAccess($item)) {
-            return redirect()->to('admin/accessories')->with('error', trans('general.insufficient_permissions'));
+            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
        }

-        return View::make('accessories/edit', compact('item'))
+        $this->authorize($item);
+
+        return view('accessories/edit', compact('item'))
          ->with('category_list', Helper::categoryList('accessory'))
          ->with('company_list', Helper::companyList())
          ->with('location_list', Helper::locationsList())
@@ -142,54 +127,32 @@ class AccessoriesController extends Controller
   * @param  int  $accessoryId
   * @return Redirect
   */
-    public function postEdit(Request $request, $accessoryId = null)
+    public function update(Request $request, $accessoryId = null)
    {
-      // Check if the accessory exists
        if (is_null($accessory = Accessory::find($accessoryId))) {
-            // Redirect to the accessory index page
-            return redirect()->to('admin/accessories')->with('error', trans('admin/accessories/message.does_not_exist'));
-        } elseif (!Company::isCurrentUserHasAccess($accessory)) {
-            return redirect()->to('admin/accessories')->with('error', trans('general.insufficient_permissions'));
+            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
        }

-      // Update the accessory data
-        $accessory->name                    = e(Input::get('name'));
+        $this->authorize($accessory);

-        if (e(Input::get('location_id')) == '') {
-            $accessory->location_id = null;
-        } else {
-            $accessory->location_id         = e(Input::get('location_id'));
-        }
-        $accessory->min_amt                 = e(Input::get('min_amt'));
-        $accessory->category_id             = e(Input::get('category_id'));
-        $accessory->company_id              = Company::getIdForCurrentUser(Input::get('company_id'));
-        $accessory->manufacturer_id         = e(Input::get('manufacturer_id'));
-        $accessory->order_number            = e(Input::get('order_number'));
-        $accessory->model_number            = e(Input::get('model_number'));
-
-        if (e(Input::get('purchase_date')) == '') {
-            $accessory->purchase_date       =  null;
-        } else {
-            $accessory->purchase_date       = e(Input::get('purchase_date'));
-        }
-
-        if (e(Input::get('purchase_cost')) == '0.00') {
-            $accessory->purchase_cost       =  null;
-        } else {
-            $accessory->purchase_cost       = e(Input::get('purchase_cost'));
-        }
-
-        $accessory->qty                     = e(Input::get('qty'));
+        // Update the accessory data
+        $accessory->name                    = request('name');
+        $accessory->location_id             = request('location_id');
+        $accessory->min_amt                 = request('min_amt');
+        $accessory->category_id             = request('category_id');
+        $accessory->company_id              = Company::getIdForCurrentUser(request('company_id'));
+        $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->qty                     = request('qty');

      // Was the accessory updated?
        if ($accessory->save()) {
-            // Redirect to the updated accessory page
-            return redirect()->to("admin/accessories")->with('success', trans('admin/accessories/message.update.success'));
+            return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.update.success'));
        }
-
-
        return redirect()->back()->withInput()->withErrors($accessory->getErrors());
-
    }

  /**
@@ -199,26 +162,20 @@ class AccessoriesController extends Controller
   * @param  int  $accessoryId
   * @return Redirect
   */
-    public function getDelete(Request $request, $accessoryId)
+    public function destroy(Request $request, $accessoryId)
    {
-        // Check if the blog post exists
        if (is_null($accessory = Accessory::find($accessoryId))) {
-            // Redirect to the blogs management page
-            return redirect()->to('admin/accessories')->with('error', trans('admin/accessories/message.not_found'));
-        } elseif (!Company::isCurrentUserHasAccess($accessory)) {
-            return redirect()->to('admin/accessories')->with('error', trans('general.insufficient_permissions'));
+            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.not_found'));
        }

+        $this->authorize($accessory);
+

        if ($accessory->hasUsers() > 0) {
-             return redirect()->to('admin/accessories')->with('error', trans('admin/accessories/message.assoc_users', array('count'=> $accessory->hasUsers())));
-        } else {
-            $accessory->delete();
-
-            // Redirect to the locations management page
-            return redirect()->to('admin/accessories')->with('success', trans('admin/accessories/message.delete.success'));
-
+             return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.assoc_users', array('count'=> $accessory->hasUsers())));
        }
+        $accessory->delete();
+        return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.delete.success'));
    }


@@ -228,31 +185,23 @@ class AccessoriesController extends Controller
  * the content for the accessory detail view, which is generated in getDataView.
  *
  * @author [A. Gianotto] [<snipe@snipe.net>]
-  * @param  int  $accessoryId
+  * @param  int  $accessoryID
  * @see AccessoriesController::getDataView() method that generates the JSON response
  * @since [v1.0]
  * @return View
  */
-    public function getView(Request $request, $accessoryID = null)
+    public function show(Request $request, $accessoryID = null)
    {
        $accessory = Accessory::find($accessoryID);
-
+        $this->authorize('view', $accessory);
        if (isset($accessory->id)) {
-
-            if (!Company::isCurrentUserHasAccess($accessory)) {
-                return redirect()->to('admin/accessories')->with('error', trans('general.insufficient_permissions'));
-            } else {
-                return View::make('accessories/view', compact('accessory'));
-            }
-        } else {
-            // 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 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);
    }

  /**
@@ -267,15 +216,13 @@ class AccessoriesController extends Controller
        // Check if the accessory exists
        if (is_null($accessory = Accessory::find($accessoryId))) {
            // Redirect to the accessory management page with error
-            return redirect()->to('accessories')->with('error', trans('admin/accessories/message.not_found'));
-        } elseif (!Company::isCurrentUserHasAccess($accessory)) {
-            return redirect()->to('admin/accessories')->with('error', trans('general.insufficient_permissions'));
+            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.not_found'));
        }

-        // Get the dropdown of users and then pass it to the checkout view
-        $users_list = Helper::usersList();
+        $this->authorize('checkout', $accessory);

-        return View::make('accessories/checkout', compact('accessory'))->with('users_list', $users_list);
+        // Get the dropdown of users and then pass it to the checkout view
+        return view('accessories/checkout', compact('accessory'))->with('users_list', Helper::usersList());

    }

@@ -294,64 +241,28 @@ class AccessoriesController extends Controller
      // Check if the accessory exists
        if (is_null($accessory = Accessory::find($accessoryId))) {
            // Redirect to the accessory management page with error
-            return redirect()->to('accessories')->with('error', trans('admin/accessories/message.user_not_found'));
-        } elseif (!Company::isCurrentUserHasAccess($accessory)) {
-            return redirect()->to('admin/accessories')->with('error', trans('general.insufficient_permissions'));
+            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.user_not_found'));
        }

+        $this->authorize('checkout', $accessory);
+
        if (!$user = User::find(Input::get('assigned_to'))) {
-            return redirect()->to('admin/accessories')->with('error', trans('admin/accessories/message.not_found'));
+            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.not_found'));
        }

      // Update the accessory data
-        $accessory->assigned_to                 = e(Input::get('assigned_to'));
+        $accessory->assigned_to = e(Input::get('assigned_to'));

-        $accessory->users()->attach($accessory->id, array(
-        'accessory_id' => $accessory->id,
-        'created_at' => Carbon::now(),
-        'user_id' => Auth::user()->id,
-        'assigned_to' => e(Input::get('assigned_to'))));
+        $accessory->users()->attach($accessory->id, [
+            'accessory_id' => $accessory->id,
+            'created_at' => Carbon::now(),
+            'user_id' => Auth::id(),
+            'assigned_to' => $request->get('assigned_to')
+        ]);

        $logaction = $accessory->logCheckout(e(Input::get('note')));

-
-
-        $admin_user = Auth::user();
-        $settings = Setting::getSettings();
-
-        if ($settings->slack_endpoint) {
-
-
-            $slack_settings = [
-              'username' => $settings->botname,
-              'channel' => $settings->slack_channel,
-              'link_names' => true
-            ];
-
-            $client = new \Maknz\Slack\Client($settings->slack_endpoint, $slack_settings);
-
-            try {
-                $client->attach([
-                'color' => 'good',
-                'fields' => [
-                  [
-                  'title' => 'Checked Out:',
-                  'value' => 'Accessory <'.config('app.url').'/admin/accessories/'.$accessory->id.'/view'.'|'.$accessory->name.'> checked out to <'.config('app.url').'/admin/users/'.$user->id.'/view|'.$user->fullName().'> by <'.config('app.url').'/admin/users/'.$admin_user->id.'/view'.'|'.$admin_user->fullName().'>.'
-                  ],
-                  [
-                      'title' => 'Note:',
-                      'value' => e(Input::get('note'))
-                  ],
-                ]
-                ])->send('Accessory Checked Out');
-            } catch (Exception $e) {
-
-            }
-
-        }
-
-
-        $accessory_user = DB::table('accessories_users')->where('assigned_to', '=', $accessory->assigned_to)->where('accessory_id', '=', $accessory->id)->first();
+        DB::table('accessories_users')->where('assigned_to', '=', $accessory->assigned_to)->where('accessory_id', '=', $accessory->id)->first();

        $data['log_id'] = $logaction->id;
        $data['eula'] = $accessory->getEula();
@@ -362,8 +273,7 @@ class AccessoriesController extends Controller
        $data['expected_checkin'] = '';
        $data['note'] = $logaction->note;
        $data['require_acceptance'] = $accessory->requireAcceptance();
-
-
+        // TODO: Port this to new mail notifications
        if (($accessory->requireAcceptance()=='1')  || ($accessory->getEula())) {

            Mail::send('emails.accept-accessory', $data, function ($m) use ($user) {
@@ -374,104 +284,62 @@ class AccessoriesController extends Controller
        }

      // Redirect to the new accessory page
-        return redirect()->to("admin/accessories")->with('success', trans('admin/accessories/message.checkout.success'));
-
-
-
+        return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.checkout.success'));
    }


-  /**
-  * Check the accessory back into inventory
-  *
-  * @author [A. Gianotto] [<snipe@snipe.net>]
-  * @param  int  $accessoryId
-  * @return View
-  **/
+    /**
+     * Check the accessory back into inventory
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param Request $request
+     * @param integer $accessoryUserId
+     * @param string $backto
+     * @return View
+     * @internal param int $accessoryId
+     */
    public function getCheckin(Request $request, $accessoryUserId = null, $backto = null)
    {
        // Check if the accessory exists
        if (is_null($accessory_user = DB::table('accessories_users')->find($accessoryUserId))) {
            // Redirect to the accessory management page with error
-            return redirect()->to('admin/accessories')->with('error', trans('admin/accessories/message.not_found'));
+            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.not_found'));
        }

        $accessory = Accessory::find($accessory_user->accessory_id);
-
-        if (!Company::isCurrentUserHasAccess($accessory)) {
-            return redirect()->to('admin/accessories')->with('error', trans('general.insufficient_permissions'));
-        } else {
-            return View::make('accessories/checkin', compact('accessory'))->with('backto', $backto);
-        }
+        $this->authorize('checkin', $accessory);
+        return view('accessories/checkin', compact('accessory'))->with('backto', $backto);
    }


-  /**
-  * Check in the item so that it can be checked out again to someone else
-  *
-  * @uses Accessory::checkin_email() to determine if an email can and should be sent
-  * @author [A. Gianotto] [<snipe@snipe.net>]
-  * @param  int  $accessoryId
-  * @return Redirect
-  **/
+    /**
+     * Check in the item so that it can be checked out again to someone else
+     *
+     * @uses Accessory::checkin_email() to determine if an email can and should be sent
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param Request $request
+     * @param integer $accessoryUserId
+     * @param string $backto
+     * @return Redirect
+     * @internal param int $accessoryId
+     */
    public function postCheckin(Request $request, $accessoryUserId = null, $backto = null)
    {
      // Check if the accessory exists
        if (is_null($accessory_user = DB::table('accessories_users')->find($accessoryUserId))) {
            // Redirect to the accessory management page with error
-            return redirect()->to('admin/accessories')->with('error', trans('admin/accessories/message.not_found'));
+            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.not_found'));
        }

-
        $accessory = Accessory::find($accessory_user->accessory_id);

-        if (!Company::isCurrentUserHasAccess($accessory)) {
-            return redirect()->to('admin/accessories')->with('error', trans('general.insufficient_permissions'));
-        }
+        $this->authorize('checkin', $accessory);

        $return_to = e($accessory_user->assigned_to);
        $logaction = $accessory->logCheckin(User::find($return_to), e(Input::get('note')));
-        $admin_user = Auth::user();

-
-      // Was the accessory updated?
+        // Was the accessory updated?
        if (DB::table('accessories_users')->where('id', '=', $accessory_user->id)->delete()) {
-
-            $settings = Setting::getSettings();
-
-            if ($settings->slack_endpoint) {
-
-
-                $slack_settings = [
-                'username' => e($settings->botname),
-                'channel' => e($settings->slack_channel),
-                'link_names' => true
-                ];
-
-                $client = new \Maknz\Slack\Client($settings->slack_endpoint, $slack_settings);
-
-                try {
-                    $client->attach([
-                        'color' => 'good',
-                        'fields' => [
-                            [
-                                'title' => 'Checked In:',
-                                'value' => class_basename(strtoupper($logaction->item_type)).' <'.config('app.url').'/admin/accessories/'.e($accessory->id).'/view'.'|'.e($accessory->name).'> checked in by <'.config('app.url').'/admin/users/'.e($admin_user->id).'/view'.'|'.e($admin_user->fullName()).'>.'
-                            ],
-                            [
-                                'title' => 'Note:',
-                                'value' => e($logaction->note)
-                            ],
-
-                        ]
-                    ])->send('Accessory Checked In');
-
-                } catch (Exception $e) {
-
-                }
-
-            }
-
            if (!is_null($accessory_user->assigned_to)) {
                $user = User::find($accessory_user->assigned_to);
            }
@@ -493,45 +361,45 @@ class AccessoriesController extends Controller
            }

            if ($backto=='user') {
-                return redirect()->to("admin/users/".$return_to.'/view')->with('success', trans('admin/accessories/message.checkin.success'));
-            } else {
-                return redirect()->to("admin/accessories/".$accessory->id."/view")->with('success', trans('admin/accessories/message.checkin.success'));
+                return redirect()->route("users.show", $return_to)->with('success', trans('admin/accessories/message.checkin.success'));
            }
+            return redirect()->route("accessories.show", $accessory->id)->with('success', trans('admin/accessories/message.checkin.success'));
        }
-
        // Redirect to the accessory management page with error
-        return redirect()->to("admin/accessories")->with('error', trans('admin/accessories/message.checkin.error'));
+        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)",
-    *  "companyName": "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  int  $accessoryId
-    * @return string JSON containing accessories and their associated atrributes.
-    **/
+     * 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')
@@ -540,21 +408,10 @@ class AccessoriesController extends Controller
        if (Input::has('search')) {
            $accessories = $accessories->TextSearch(e(Input::get('search')));
        }
+        $offset = request('offset', 0);
+        $limit = request('limit', 50);

-        if (Input::has('offset')) {
-            $offset = e(Input::get('offset'));
-        } else {
-            $offset = 0;
-        }
-
-        if (Input::has('limit')) {
-            $limit = e(Input::get('limit'));
-        } else {
-            $limit = 50;
-        }
-
-
-        $allowed_columns = ['name','min_amt','order_number','purchase_date','purchase_cost','companyName','category','model_number'];
+        $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';

@@ -562,9 +419,15 @@ class AccessoriesController extends Controller
            case 'category':
                $accessories = $accessories->OrderCategory($order);
                break;
-            case 'companyName':
+            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;
@@ -576,39 +439,7 @@ class AccessoriesController extends Controller
        $rows = array();

        foreach ($accessories as $accessory) {
-
-            $actions = '<nobr>';
-            if (Gate::allows('accessories.checkout')) {
-                $actions .= '<a href="' . route('checkout/accessory',
-                        $accessory->id) . '" style="margin-right:5px;" class="btn btn-info btn-sm" ' . (($accessory->numRemaining() > 0) ? '' : ' disabled') . '>' . trans('general.checkout') . '</a>';
-            }
-            if (Gate::allows('accessories.edit')) {
-                $actions .= '<a href="' . route('update/accessory',
-                        $accessory->id) . '" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a>';
-            }
-            if (Gate::allows('accessories.delete')) {
-                $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/accessory',
-                        $accessory->id) . '" data-content="' . trans('admin/accessories/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($accessory->name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
-            }
-            $actions .= '</nobr>';
-            $company = $accessory->company;
-
-            $rows[] = array(
-            'name'          => '<a href="'.url('admin/accessories/'.$accessory->id).'/view">'. $accessory->name.'</a>',
-            'category'      => ($accessory->category) ? (string)link_to('admin/settings/categories/'.$accessory->category->id.'/view', $accessory->category->name) : '',
-            'model_number'      =>  e($accessory->model_number),
-            'qty'           => e($accessory->qty),
-            'order_number'  => e($accessory->order_number),
-            'min_amt'  => e($accessory->min_amt),
-            'location'      => ($accessory->location) ? e($accessory->location->name): '',
-            'purchase_date' => e($accessory->purchase_date),
-            'purchase_cost' => Helper::formatCurrencyOutput($accessory->purchase_cost),
-            'numRemaining'  => $accessory->numRemaining(),
-            'actions'       => $actions,
-            'companyName'   => is_null($company) ? '' : e($company->name),
-            'manufacturer'      => $accessory->manufacturer ? (string) link_to('/admin/settings/manufacturers/'.$accessory->manufacturer_id.'/view', $accessory->manufacturer->name) : ''
-
-            );
+            $rows[] = $accessory->present()->forDataTable();
        }

        $data = array('total'=>$accessCount, 'rows'=>$rows);
@@ -657,15 +488,14 @@ class AccessoriesController extends Controller

        foreach ($accessory_users as $user) {
            $actions = '';
-            if (Gate::allows('accessories.checkin')) {
-                $actions .= '<a href="' . route('checkin/accessory',
-                        $user->pivot->id) . '" class="btn btn-info btn-sm">Checkin</a>';
+            if (Gate::allows('checkin', $accessory)) {
+                $actions .= Helper::generateDatatableButton('checkin', route('checkin/accessory', $user->pivot->id));
            }

-            if (Gate::allows('users.view')) {
-                $name = (string) link_to('/admin/users/'.$user->id.'/view', e($user->fullName()));
+            if (Gate::allows('view', $user)) {
+                $name = (string) link_to_route('users.show', e($user->present()->fullName()), [$user->id]);
            } else {
-                $name = e($user->fullName());
+                $name = e($user->present()->fullName());
            }

            $rows[] = array(
--- a/app/Http/Controllers/ActionlogController.php
+++ b/app/Http/Controllers/ActionlogController.php
@@ -9,7 +9,7 @@ class ActionlogController extends Controller
 {
    public function displaySig($filename)
    {
-
+        $this->authorize('view', \App\Models\Asset::class);
        $file = config('app.private_uploads') . '/signatures/' . $filename;
        $filetype = Helper::checkUploadIsImage($file);
        $contents = file_get_contents($file);
--- a/app/Http/Controllers/Api/AccessoriesController.php
+++ b/app/Http/Controllers/Api/AccessoriesController.php
@@ -0,0 +1,182 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Helpers\Helper;
+use App\Models\Accessory;
+use App\Http\Transformers\AccessoriesTransformer;
+
+
+class AccessoriesController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        $this->authorize('view', Accessory::class);
+        $allowed_columns = ['id','name','model_number','eol','notes','created_at','min_amt','company_id'];
+
+        $accessories = Accessory::whereNull('accessories.deleted_at')->with('category', 'company', 'manufacturer', 'users', 'location');
+
+        if ($request->has('search')) {
+            $accessories = $accessories->TextSearch($request->input('search'));
+        }
+
+        if ($request->has('company_id')) {
+            $accessories->where('company_id','=',$request->input('company_id'));
+        }
+
+        if ($request->has('manufacturer_id')) {
+            $accessories->where('manufacturer_id','=',$request->input('manufacturer_id'));
+        }
+
+        $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';
+
+        switch ($sort) {
+            case 'category':
+                $accessories = $accessories->OrderCategory($order);
+                break;
+            case 'company':
+                $accessories = $accessories->OrderCompany($order);
+                break;
+            default:
+                $accessories = $accessories->orderBy($sort, $order);
+                break;
+        }
+
+        $accessories->orderBy($sort, $order);
+
+        $total = $accessories->count();
+        $accessories = $accessories->skip($offset)->take($limit)->get();
+        return (new AccessoriesTransformer)->transformAccessories($accessories, $total);
+    }
+
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $this->authorize('create', Accessory::class);
+        $accessory = new Accessory;
+        $accessory->fill($request->all());
+
+        if ($accessory->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $accessory, trans('admin/accessories/message.create.success')));
+        }
+        return response()->json(Helper::formatStandardApiResponse('error', null, $accessory->getErrors()));
+
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        $this->authorize('view', Accessory::class);
+        $accessory = Accessory::findOrFail($id);
+        $accessory_users = $accessory->users;
+
+        return (new AccessoriesTransformer)->transformAccessory($accessory);
+    }
+
+
+    /**
+     * Display the specified resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function accessory_detail($id)
+    {
+        $this->authorize('view', Accessory::class);
+        $accessory = Accessory::findOrFail($id);
+        return (new AccessoriesTransformer)->transformAccessory($accessory);
+    }
+
+
+    /**
+     * Display the specified resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function checkedout($id)
+    {
+        $this->authorize('view', Accessory::class);
+        $accessory = Accessory::findOrFail($id)->with('users')->first();
+        $accessories_users = $accessory->users;
+        $total = $accessories_users->count();
+        return (new AccessoriesTransformer)->transformCheckedoutAccessories($accessories_users, $total);
+    }
+
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        $this->authorize('edit', Accessory::class);
+        $accessory = Accessory::findOrFail($id);
+        $accessory->fill($request->all());
+
+        if ($accessory->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $accessory, trans('admin/accessories/message.update.success')));
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, $accessory->getErrors()));
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        $this->authorize('delete', Accessory::class);
+        $accessory = Accessory::findOrFail($id);
+        $this->authorize($accessory);
+
+        if ($accessory->hasUsers() > 0) {
+            return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/accessories/message.assoc_users', array('count'=> $accessory->hasUsers()))));
+        }
+
+        $accessory->delete();
+        return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/accessories/message.delete.success')));
+
+    }
+}
--- a/app/Http/Controllers/Api/AssetMaintenancesController.php
+++ b/app/Http/Controllers/Api/AssetMaintenancesController.php
@@ -0,0 +1,226 @@
+<?php
+namespace App\Http\Controllers\Api;
+
+use App\Models\AssetMaintenance;
+use Carbon\Carbon;
+use App\Models\Company;
+use App\Models\Asset;
+use App\Helpers\Helper;
+use Auth;
+use Gate;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Http\Transformers\AssetMaintenancesTransformer;
+
+/**
+ * This controller handles all actions related to Asset Maintenance for
+ * the Snipe-IT Asset Management application.
+ *
+ * @version    v2.0
+ */
+class AssetMaintenancesController extends Controller
+{
+
+
+    /**
+     *  Generates the JSON response for asset maintenances listing view.
+     *
+     * @see AssetMaintenancesController::getIndex() method that generates view
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @version v1.0
+     * @since [v1.8]
+     * @return String JSON
+     */
+    public function index(Request $request)
+    {
+        $maintenances = AssetMaintenance::with('asset', 'supplier', 'asset.company', 'admin');
+
+        if (Input::has('search')) {
+            $maintenances = $maintenances->TextSearch(e($request->input('search')));
+        }
+
+        $offset = request('offset', 0);
+        $limit = request('limit', 50);
+
+        $allowed_columns = ['id','title','asset_maintenance_time','asset_maintenance_type','cost','start_date','completion_date','notes','user_id'];
+        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array(Input::get('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';
+
+        switch ($sort) {
+            case 'user_id':
+                $maintenances = $maintenances->OrderAdmin($order);
+                break;
+            default:
+                $maintenances = $maintenances->orderBy($sort, $order);
+                break;
+        }
+
+
+        $maintenances = $maintenances->skip($offset)->take($limit)->get();
+
+
+        return (new AssetMaintenancesTransformer())->transformAssetMaintenances($maintenances, $maintenances->count());
+
+
+    }
+
+
+    /**
+     *  Validates and stores the new asset maintenance
+     *
+     * @see AssetMaintenancesController::getCreate() method for the form
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @version v1.0
+     * @since [v1.8]
+     * @return String JSON
+     */
+    public function store(Request $request)
+    {
+        // create a new model instance
+        $assetMaintenance = new AssetMaintenance();
+        $assetMaintenance->supplier_id = $request->input('supplier_id');
+        $assetMaintenance->is_warranty = $request->input('is_warranty');
+        $assetMaintenance->cost =  e($request->input('cost'));
+        $assetMaintenance->notes = e($request->input('notes'));
+        $asset = Asset::find(e($request->input('asset_id')));
+
+        if (!Company::isCurrentUserHasAccess($asset)) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot add a maintenance for that asset'));
+        }
+
+        // Save the asset maintenance data
+        $assetMaintenance->asset_id               = $request->input('asset_id');
+        $assetMaintenance->asset_maintenance_type = $request->input('asset_maintenance_type');
+        $assetMaintenance->title                  = $request->input('title');
+        $assetMaintenance->start_date             = $request->input('start_date');
+        $assetMaintenance->completion_date        = $request->input('completion_date');
+        $assetMaintenance->user_id                = Auth::id();
+
+        if (( $assetMaintenance->completion_date !== null )
+            && ( $assetMaintenance->start_date !== "" )
+            && ( $assetMaintenance->start_date !== "0000-00-00" )
+        ) {
+            $startDate                                = Carbon::parse($assetMaintenance->start_date);
+            $completionDate                           = Carbon::parse($assetMaintenance->completion_date);
+            $assetMaintenance->asset_maintenance_time = $completionDate->diffInDays($startDate);
+        }
+
+        // Was the asset maintenance created?
+        if ($assetMaintenance->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $assetMaintenance, trans('admin/asset_maintenances/message.create.success')));
+
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, $assetMaintenance->getErrors()));
+
+    }
+
+
+    /**
+     *  Validates and stores an update to an asset maintenance
+     *
+     * @author  A. Gianotto <snipe@snipe.net>
+     * @param int $assetMaintenanceId
+     * @param int $request
+     * @version v1.0
+     * @since [v4.0]
+     * @return String JSON
+     */
+    public function update(Request $request, $assetMaintenanceId = null)
+    {
+        // Check if the asset maintenance exists
+        $assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId);
+
+        if (!Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot edit a maintenance for that asset'));
+        }
+
+        $assetMaintenance->supplier_id = e($request->input('supplier_id'));
+        $assetMaintenance->is_warranty = e($request->input('is_warranty'));
+        $assetMaintenance->cost =  Helper::ParseFloat(e($request->input('cost')));
+        $assetMaintenance->notes = e($request->input('notes'));
+
+        $asset = Asset::find(request('asset_id'));
+
+        if (!Company::isCurrentUserHasAccess($asset)) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot edit a maintenance for that asset'));
+        }
+
+        // Save the asset maintenance data
+        $assetMaintenance->asset_id               = $request->input('asset_id');
+        $assetMaintenance->asset_maintenance_type = $request->input('asset_maintenance_type');
+        $assetMaintenance->title                  = $request->input('title');
+        $assetMaintenance->start_date             = $request->input('start_date');
+        $assetMaintenance->completion_date        = $request->input('completion_date');
+
+        if (( $assetMaintenance->completion_date == null )
+        ) {
+            if (( $assetMaintenance->asset_maintenance_time !== 0 )
+                || ( !is_null($assetMaintenance->asset_maintenance_time) )
+            ) {
+                $assetMaintenance->asset_maintenance_time = null;
+            }
+        }
+
+        if (( $assetMaintenance->completion_date !== null )
+            && ( $assetMaintenance->start_date !== "" )
+            && ( $assetMaintenance->start_date !== "0000-00-00" )
+        ) {
+            $startDate                                = Carbon::parse($assetMaintenance->start_date);
+            $completionDate                           = Carbon::parse($assetMaintenance->completion_date);
+            $assetMaintenance->asset_maintenance_time = $completionDate->diffInDays($startDate);
+        }
+
+        // Was the asset maintenance created?
+        if ($assetMaintenance->save()) {
+
+            return response()->json(Helper::formatStandardApiResponse('success', $assetMaintenance, trans('admin/asset_maintenances/message.edit.success')));
+
+        }
+        return response()->json(Helper::formatStandardApiResponse('error', null, $assetMaintenance->getErrors()));
+    }
+
+    /**
+     *  Delete an asset maintenance
+     *
+     * @author  A. Gianotto <snipe@snipe.net>
+     * @param int $assetMaintenanceId
+     * @version v1.0
+     * @since [v4.0]
+     * @return String JSON
+     */
+    public function destroy($assetMaintenanceId)
+    {
+        // Check if the asset maintenance exists
+        $assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId);
+
+        if (!Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot delete a maintenance for that asset'));
+        }
+
+        $assetMaintenance->delete();
+
+        return response()->json(Helper::formatStandardApiResponse('success', $assetMaintenance, trans('admin/asset_maintenances/message.delete.success')));
+
+
+    }
+
+    /**
+     *  View an asset maintenance
+     *
+     * @author  A. Gianotto <snipe@snipe.net>
+     * @param int $assetMaintenanceId
+     * @version v1.0
+     * @since [v4.0]
+     * @return String JSON
+     */
+    public function show($assetMaintenanceId)
+    {
+        $assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId);
+        if (!Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot view a maintenance for that asset'));
+        }
+        return (new AssetMaintenancesTransformer())->transformAssetMaintenance($assetMaintenance);
+
+    }
+}
--- a/app/Http/Controllers/Api/AssetModelsController.php
+++ b/app/Http/Controllers/Api/AssetModelsController.php
@@ -0,0 +1,161 @@
+<?php
+namespace App\Http\Controllers\Api;
+
+use App\Models\AssetModel;
+use App\Models\Asset;
+use App\Http\Controllers\Controller;
+use App\Helpers\Helper;
+use Illuminate\Http\Request;
+use App\Http\Transformers\AssetModelsTransformer;
+use App\Http\Transformers\AssetsTransformer;
+
+
+/**
+ * This class controls all actions related to asset models for
+ * the Snipe-IT Asset Management application.
+ *
+ * @version    v4.0
+ * @author [A. Gianotto] [<snipe@snipe.net>]
+ */
+class AssetModelsController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        $this->authorize('view', AssetModel::class);
+        $allowed_columns = ['id','image','name','model_number','eol','notes','created_at','manufacturer'];
+
+        $assetmodels = AssetModel::select(['models.id','models.image','models.name','model_number','eol','models.notes','models.created_at','category_id','manufacturer_id','depreciation_id','fieldset_id'])
+            ->with('category','depreciation', 'manufacturer','fieldset')
+            ->withCount('assets');
+
+        if ($request->has('search')) {
+            $assetmodels->TextSearch($request->input('search'));
+        }
+
+
+        $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') : 'models.created_at';
+
+        switch ($sort) {
+            case 'manufacturer':
+                $assetmodels->OrderManufacturer($order);
+                break;
+            default:
+                $assetmodels->orderBy($sort, $order);
+                break;
+        }
+
+
+        $total = $assetmodels->count();
+        $assetmodels = $assetmodels->skip($offset)->take($limit)->get();
+        return (new AssetModelsTransformer)->transformAssetModels($assetmodels, $total);
+    }
+
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $this->authorize('create', AssetModel::class);
+        $assetmodel = new AssetModel;
+        $assetmodel->fill($request->all());
+
+        if ($assetmodel->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $assetmodel, trans('admin/models/message.create.success')));
+        }
+        return response()->json(Helper::formatStandardApiResponse('error', null, $assetmodel->getErrors()));
+
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        $this->authorize('view', AssetModel::class);
+        $assetmodel = AssetModel::withCount('assets')->findOrFail($id);
+        return (new AssetModelsTransformer)->transformAssetModel($assetmodel);
+    }
+
+    /**
+     * Display the specified resource's assets
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function assets($id)
+    {
+        $this->authorize('view', AssetModel::class);
+        $assets = Asset::where('model_id','=',$id)->get();
+        return (new AssetsTransformer)->transformAssets($assets, $assets->count());
+    }
+
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        $this->authorize('edit', AssetModel::class);
+        $assetmodel = AssetModel::findOrFail($id);
+        $assetmodel->fill($request->all());
+        $assetmodel->fieldset_id = $request->get("custom_fieldset_id");
+
+        if ($assetmodel->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $assetmodel, trans('admin/assetmodels/message.update.success')));
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, $assetmodel->getErrors()));
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        $this->authorize('delete', AssetModel::class);
+        $assetmodel = AssetModel::findOrFail($id);
+        $this->authorize('delete', $assetmodel);
+
+        if ($assetmodel->assets()->count() > 0) {
+            return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/models/message.assoc_users')));
+        }
+
+        $assetmodel->delete();
+        return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/assetmodels/message.delete.success')));
+
+    }
+}
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -0,0 +1,497 @@
+<?php
+namespace App\Http\Controllers\Api;
+
+use App\Helpers\Helper;
+use App\Http\Controllers\Controller;
+use App\Http\Requests\AssetRequest;
+use App\Http\Transformers\AssetsTransformer;
+use App\Models\Asset;
+use App\Models\AssetModel;
+use App\Models\Company;
+use App\Models\CustomField;
+use App\Models\Location;
+use App\Models\Setting;
+use App\Models\User;
+use Artisan;
+use Auth;
+use Carbon\Carbon;
+use Config;
+use DB;
+use Gate;
+use Illuminate\Http\Request;
+use Input;
+use Lang;
+use Log;
+use Mail;
+use Paginator;
+use Response;
+use Slack;
+use Str;
+use TCPDF;
+use Validator;
+use View;
+
+/**
+ * This class controls all actions related to assets for
+ * the Snipe-IT Asset Management application.
+ *
+ * @version    v1.0
+ * @author [A. Gianotto] [<snipe@snipe.net>]
+ */
+class AssetsController extends Controller
+{
+
+    /**
+     * Returns JSON listing of all assets
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param int $assetId
+     * @since [v4.0]
+     * @return JsonResponse
+     */
+    public function index(Request $request)
+    {
+        $this->authorize('index', Asset::class);
+
+        $allowed_columns = [
+            'id',
+            'name',
+            'asset_tag',
+            'serial',
+            'model_number',
+            'last_checkout',
+            'notes',
+            'expected_checkin',
+            'order_number',
+            'image',
+            'assigned_to',
+            'created_at',
+            'updated_at',
+            'purchase_date',
+            'purchase_cost'
+        ];
+
+        $filter = array();
+        if ($request->has('filter')) {
+            $filter = json_decode($request->input('filter'));
+        }
+
+
+        $all_custom_fields = CustomField::all(); //used as a 'cache' of custom fields throughout this page load
+        foreach ($all_custom_fields as $field) {
+            $allowed_columns[]=$field->db_column_name();
+        }
+
+        $assets = Company::scopeCompanyables(Asset::select('assets.*'))->with(
+            'assetLoc', 'assetstatus', 'defaultLoc', 'assetlog', 'company',
+            'model.category', 'model.manufacturer', 'model.fieldset', 'assigneduser','supplier');
+
+        // If we should search on everything
+        if (($request->has('search')) && (count($filter) == 0)) {
+            $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'));
+        }
+
+        if ($request->has('model_id')) {
+            $assets->InModelList([$request->input('model_id')]);
+        }
+
+        if ($request->has('category_id')) {
+            $assets->InCategory($request->input('category_id'));
+        }
+
+        if ($request->has('location_id')) {
+            $assets->ByLocationId($request->input('location_id'));
+        }
+
+        if ($request->has('supplier_id')) {
+            $assets->where('assets.supplier_id', '=', $request->input('supplier_id'));
+        }
+
+        if ($request->has('company_id')) {
+            $assets->where('assets.company_id', '=', $request->input('company_id'));
+        }
+
+        if ($request->has('manufacturer_id')) {
+            $assets->ByManufacturer($request->input('manufacturer_id'));
+        }
+
+        $request->has('order_number') ? $assets = $assets->where('order_number', '=', e($request->get('order_number'))) : '';
+
+        $offset = request('offset', 0);
+        $limit = $request->input('limit', 50);
+        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
+
+
+        // This is used by the sidenav, mostly
+        switch ($request->input('status')) {
+            case 'Deleted':
+                $assets->withTrashed()->Deleted();
+                break;
+            case 'Pending':
+                $assets->Pending();
+                break;
+            case 'RTD':
+                $assets->RTD();
+                break;
+            case 'Undeployable':
+                $assets->Undeployable();
+                break;
+            case 'Archived':
+                $assets->Archived();
+                break;
+            case 'Requestable':
+                $assets->RequestableAssets();
+                break;
+            case 'Deployed':
+                $assets->Deployed();
+                break;
+        }
+
+
+
+        // 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')) {
+            case 'model':
+                $assets->OrderModels($order);
+                break;
+            case 'model_number':
+                $assets->OrderModelNumber($order);
+                break;
+            case 'category':
+                $assets->OrderCategory($order);
+                break;
+            case 'manufacturer':
+                $assets->OrderManufacturer($order);
+                break;
+            case 'company':
+                $assets->OrderCompany($order);
+                break;
+            case 'location':
+                $assets->OrderLocation($order);
+                break;
+            case 'status_label':
+                $assets->OrderStatus($order);
+                break;
+            case 'supplier':
+                $assets->OrderSupplier($order);
+                break;
+            case 'assigned_to':
+                $assets->OrderAssigned($order);
+                break;
+            default:
+                $assets->orderBy($column_sort, $order);
+                break;
+        }
+        
+        $total = $assets->count();
+        $assets = $assets->skip($offset)->take($limit)->get();
+        return (new AssetsTransformer)->transformAssets($assets, $total);
+    }
+
+
+     /**
+     * Returns JSON with information about an asset for detail view.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param int $assetId
+     * @since [v4.0]
+     * @return JsonResponse
+     */
+    public function show($id)
+    {
+        if ($asset = Asset::withTrashed()->find($id)) {
+            $this->authorize('view', $asset);
+            return (new AssetsTransformer)->transformAsset($asset);
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200);
+    }
+
+
+    /**
+     * Accepts a POST request to create a new asset
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param Request $request
+     * @since [v4.0]
+     * @return JsonResponse
+     */
+    public function store(AssetRequest $request)
+    {
+        // $this->authorize('create', Asset::class);
+
+        $asset = new Asset();
+        $asset->model()->associate(AssetModel::find((int) $request->get('model_id')));
+
+        $asset->name                    = $request->get('name');
+        $asset->serial                  = $request->get('serial');
+        $asset->company_id              = Company::getIdForCurrentUser($request->get('company_id'));
+        $asset->model_id                = $request->get('model_id');
+        $asset->order_number            = $request->get('order_number');
+        $asset->notes                   = $request->get('notes');
+        $asset->asset_tag               = $request->get('asset_tag');
+        $asset->user_id                 = Auth::id();
+        $asset->archived                = '0';
+        $asset->physical                = '1';
+        $asset->depreciate              = '0';
+        $asset->status_id               = $request->get('status_id', 0);
+        $asset->warranty_months         = $request->get('warranty_months', null);
+        $asset->purchase_cost           = Helper::ParseFloat($request->get('purchase_cost'));
+        $asset->purchase_date           = $request->get('purchase_date', null);
+        $asset->assigned_to             = $request->get('assigned_to', null);
+        $asset->supplier_id             = $request->get('supplier_id', 0);
+        $asset->requestable             = $request->get('requestable', 0);
+        $asset->rtd_location_id         = $request->get('rtd_location_id', null);
+
+        // Update custom fields in the database.
+        // Validation for these fields is handled through the AssetRequest form request
+        $model = AssetModel::find($request->get('model_id'));
+        if ($model->fieldset) {
+            foreach ($model->fieldset->fields as $field) {
+                $asset->{$field->convertUnicodeDbSlug()} = e($request->input($field->convertUnicodeDbSlug()));
+            }
+        }
+
+        if ($asset->save()) {
+            $asset->logCreate();
+            if ($request->get('assigned_user')) {
+                $target = User::find(request('assigned_user'));
+            } elseif ($request->get('assigned_asset')) {
+                $target = Asset::find(request('assigned_asset'));
+            } elseif ($request->get('assigned_location')) {
+                $target = Location::find(request('assigned_location'));
+            }
+            if (isset($target)) {
+                $asset->checkOut($target, Auth::user(), date('Y-m-d H:i:s'), '', 'Checked out on asset creation', e($request->get('name')));
+            }
+            return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.create.success')));
+        }
+        return response()->json(Helper::formatStandardApiResponse('error', null, $asset->getErrors()), 200);
+    }
+
+
+    /**
+     * Accepts a POST request to update an asset
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param Request $request
+     * @since [v4.0]
+     * @return JsonResponse
+     */
+    public function update(Request $request, $id)
+    {
+        $this->authorize('create', Asset::class);
+
+        if ($asset = Asset::find($id)) {
+            ($request->has('model_id')) ?
+                $asset->model()->associate(AssetModel::find($request->get('model_id'))) : '';
+            ($request->has('name')) ?
+                $asset->name = $request->get('name') : '';
+            ($request->has('serial')) ?
+                $asset->serial = $request->get('serial') : '';
+            ($request->has('model_id')) ?
+                $asset->model_id = $request->get('model_id') : '';
+            ($request->has('order_number')) ?
+                $asset->order_number = $request->get('order_number') : '';
+            ($request->has('notes')) ?
+                $asset->notes = $request->get('notes') : '';
+            ($request->has('asset_tag')) ?
+                $asset->asset_tag = $request->get('asset_tag') : '';
+            ($request->has('archived')) ?
+                $asset->archived = $request->get('archived') : '';
+            ($request->has('status_id')) ?
+                $asset->status_id = $request->get('status_id') : '';
+            ($request->has('warranty_months')) ?
+                $asset->warranty_months = $request->get('warranty_months') : '';
+            ($request->has('purchase_cost')) ?
+                $asset->purchase_cost = Helper::ParseFloat($request->get('purchase_cost')) : '';
+            ($request->has('purchase_date')) ?
+                $asset->purchase_date = $request->get('purchase_date') : '';
+            ($request->has('assigned_to')) ?
+                $asset->assigned_to = $request->get('assigned_to') : '';
+            ($request->has('supplier_id')) ?
+                $asset->supplier_id = $request->get('supplier_id') : '';
+            ($request->has('requestable')) ?
+                $asset->requestable = $request->get('requestable') : '';
+            ($request->has('rtd_location_id')) ?
+                $asset->rtd_location_id = $request->get('rtd_location_id') : '';
+            ($request->has('company_id')) ?
+                $asset->company_id = Company::getIdForCurrentUser($request->get('company_id')) : '';
+
+            if ($request->has('model_id')) {
+                if (($model = AssetModel::find($request->get('model_id'))) && (isset($model->fieldset))) {
+                    foreach ($model->fieldset->fields as $field) {
+                        if ($request->has($field->convertUnicodeDbSlug())) {
+                            $asset->{$field->convertUnicodeDbSlug()} = e($request->input($field->convertUnicodeDbSlug()));
+                        }
+                    }
+                }
+            }
+
+            if ($asset->save()) {
+
+                if ($request->get('assigned_user')) {
+                    $target = User::find(request('assigned_user'));
+                } elseif ($request->get('assigned_asset')) {
+                    $target = Asset::find(request('assigned_asset'));
+                } elseif ($request->get('assigned_location')) {
+                    $target = Location::find(request('assigned_location'));
+                }
+
+                if (isset($target)) {
+                    $asset->checkOut($target, Auth::user(), date('Y-m-d H:i:s'), '', 'Checked out on asset update', e($request->get('name')));
+                }
+
+                return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.update.success')));
+            }
+            return response()->json(Helper::formatStandardApiResponse('error', null, $asset->getErrors()), 200);
+        }
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200);
+    }
+
+
+    /**
+     * Delete a given asset (mark as deleted).
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param int $assetId
+     * @since [v4.0]
+     * @return JsonResponse
+     */
+    public function destroy($id)
+    {
+        $this->authorize('delete', Asset::class);
+
+        if ($asset = Asset::find($id)) {
+
+            $this->authorize('delete', $asset);
+
+            DB::table('assets')
+                ->where('id', $asset->id)
+                ->update(array('assigned_to' => null));
+
+            $asset->delete();
+
+            return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/hardware/message.delete.success')));
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200);
+    }
+
+
+
+    /**
+     * Checkout an asset
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param int $assetId
+     * @since [v4.0]
+     * @return JsonResponse
+     */
+    public function checkout(Request $request, $asset_id)
+    {
+        $this->authorize('checkout', Asset::class);
+        $asset = Asset::findOrFail($asset_id);
+
+        if (!$asset->availableForCheckout()) {
+            return response()->json(Helper::formatStandardApiResponse('error', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkout.not_available')));
+        }
+
+        $this->authorize('checkout', $asset);
+
+        if ($request->has('user_id')) {
+            $target = User::find($request->input('user_id'));
+        } elseif ($request->has('asset_id')) {
+            $target = Asset::find($request->input('asset_id'));
+        } elseif ($request->has('location_id')) {
+            $target = Location::find($request->input('location_id'));
+        }
+
+        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).'.'));
+        }
+
+        $checkout_at = request('checkout_at', date("Y-m-d H:i:s"));
+        $expected_checkin = request('expected_checkin', null);
+        $note = request('note', null);
+        $asset_name = request('name', null);
+        
+
+        if ($asset->checkOut($target, Auth::user(), $checkout_at, $expected_checkin, $note, $asset_name)) {
+            return response()->json(Helper::formatStandardApiResponse('success', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkout.success')));
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkout.error')))->withErrors($asset->getErrors());
+    }
+
+
+    /**
+     * Checkin an asset
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param int $assetId
+     * @since [v4.0]
+     * @return JsonResponse
+     */
+    public function checkin($asset_id)
+    {
+        $this->authorize('checkin', Asset::class);
+        $asset = Asset::findOrFail($asset_id);
+        $this->authorize('checkin', $asset);
+
+
+        $user = $asset->assignedUser;
+        if (is_null($target = $asset->assignedTo)) {
+            return response()->json(Helper::formatStandardApiResponse('error', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkin.already_checked_in')));
+        }
+
+        $asset->expected_checkin = null;
+        $asset->last_checkout = null;
+        $asset->assigned_to = null;
+        $asset->assignedTo()->disassociate($asset);
+        $asset->accepted = null;
+        $asset->name = e(Input::get('name'));
+
+        if (Input::has('status_id')) {
+            $asset->status_id =  e(Input::get('status_id'));
+        }
+
+        // Was the asset updated?
+        if ($asset->save()) {
+            $logaction = $asset->logCheckin($target, e(request('note')));
+
+            $data['log_id'] = $logaction->id;
+            $data['first_name'] = get_class($target) == User::class ? $target->first_name : '';
+            $data['item_name'] = $asset->present()->name();
+            $data['checkin_date'] = $logaction->created_at;
+            $data['item_tag'] = $asset->asset_tag;
+            $data['item_serial'] = $asset->serial;
+            $data['note'] = $logaction->note;
+
+            if ((($asset->checkin_email()=='1')) && (isset($user)) && (!config('app.lock_passwords'))) {
+                Mail::send('emails.checkin-asset', $data, function ($m) use ($user) {
+                    $m->to($user->email, $user->first_name . ' ' . $user->last_name);
+                    $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
+                    $m->subject(trans('mail.Confirm_Asset_Checkin'));
+                });
+            }
+
+            return response()->json(Helper::formatStandardApiResponse('success', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkin.success')));
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('success', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkin.error')));
+    }
+}
--- a/app/Http/Controllers/Api/CategoriesController.php
+++ b/app/Http/Controllers/Api/CategoriesController.php
@@ -0,0 +1,131 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Helpers\Helper;
+use App\Models\Category;
+use App\Http\Transformers\CategoriesTransformer;
+
+class CategoriesController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        $this->authorize('view', Category::class);
+        $allowed_columns = ['id', 'name','category_type','use_default_eula','require_acceptance','checkin_email'];
+
+        $categories = Category::select(['id', 'created_at', 'updated_at', 'name','category_type','use_default_eula','require_acceptance','checkin_email'])
+            ->withCount('assets', 'accessories', 'consumables', 'components');
+
+        if ($request->has('search')) {
+            $categories = $categories->TextSearch($request->input('search'));
+        }
+
+        $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';
+        $categories->orderBy($sort, $order);
+
+        $total = $categories->count();
+        $categories = $categories->skip($offset)->take($limit)->get();
+        return (new CategoriesTransformer)->transformCategories($categories, $total);
+
+    }
+
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $this->authorize('create', Category::class);
+        $category = new Category;
+        $category->fill($request->all());
+
+        if ($category->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $category, trans('admin/categories/message.create.success')));
+        }
+        return response()->json(Helper::formatStandardApiResponse('error', null, $category->getErrors()));
+
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        $this->authorize('view', Category::class);
+        $category = Category::findOrFail($id);
+        return (new CategoriesTransformer)->transformCategory($category);
+
+    }
+
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        $this->authorize('edit', Category::class);
+        $category = Category::findOrFail($id);
+        $category->fill($request->all());
+
+        if ($category->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $category, trans('admin/categories/message.update.success')));
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, $category->getErrors()));
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        $this->authorize('delete', Category::class);
+        $category = Category::findOrFail($id);
+
+        if ($category->has_models() > 0) {
+            return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/categories/message.assoc_items', ['asset_type'=>'model'])));
+        } elseif ($category->accessories()->count() > 0) {
+            return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/categories/message.assoc_items', ['asset_type'=>'accessory'])));
+        } elseif ($category->consumables()->count() > 0) {
+            return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/categories/message.assoc_items', ['asset_type'=>'consumable'])));
+        } elseif ($category->components()->count() > 0) {
+            return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/categories/message.assoc_items', ['asset_type'=>'component'])));
+        }
+        $category->delete();
+        return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/categories/message.delete.success')));
+
+    }
+}
--- a/app/Http/Controllers/Api/CompaniesController.php
+++ b/app/Http/Controllers/Api/CompaniesController.php
@@ -0,0 +1,144 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Http\Transformers\CompaniesTransformer;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Helpers\Helper;
+use App\Models\Company;
+
+class CompaniesController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        $this->authorize('view', Company::class);
+
+        $allowed_columns = ['id','name'];
+
+        $companies = Company::withCount('assets','licenses','accessories','consumables','components','users')
+            ->withCount('users')->withCount('users')->withCount('assets')
+            ->withCount('licenses')->withCount('accessories')
+            ->withCount('consumables')->withCount('components');
+
+        if ($request->has('search')) {
+            $companies->TextSearch($request->input('search'));
+        }
+
+        $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';
+        $companies->orderBy($sort, $order);
+
+        $total = $companies->count();
+        $companies = $companies->skip($offset)->take($limit)->get();
+        return (new CompaniesTransformer)->transformCompanies($companies, $total);
+
+    }
+
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $this->authorize('create', Company::class);
+        $company = new Company;
+        $company->fill($request->all());
+
+        if ($company->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', (new CompaniesTransformer)->transformCompany($company), trans('admin/companies/message.create.success')));
+        }
+        return response()
+            ->json(Helper::formatStandardApiResponse('error', null, $company->getErrors()));
+
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        $this->authorize('view', Company::class);
+        $company = Company::findOrFail($id);
+        return (new CompaniesTransformer)->transformCompany($company);
+
+    }
+
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        $this->authorize('edit', Company::class);
+        $company = Company::findOrFail($id);
+        $company->fill($request->all());
+
+        if ($company->save()) {
+            return response()
+                ->json(Helper::formatStandardApiResponse('success', (new CompaniesTransformer)->transformCompany($company), trans('admin/companies/message.update.success')));
+        }
+
+        return response()
+            ->json(Helper::formatStandardApiResponse('error', null, $company->getErrors()));
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+       $this->authorize('delete', Company::class);
+       $company = Company::findOrFail($id);
+            $this->authorize('delete', $company);
+
+        try {
+            $company->delete();
+            return response()
+                ->json(Helper::formatStandardApiResponse('success', null,  trans('admin/companies/message.delete.success')));
+        } catch (\Illuminate\Database\QueryException $exception) {
+            /*
+                 * NOTE: This happens when there's a foreign key constraint violation
+                 * For example when rows in other tables are referencing this company
+                 */
+            if ($exception->getCode() == 23000) {
+                return response()
+                    ->json(Helper::formatStandardApiResponse('error', null,  trans('admin/companies/message.assoc_users')));
+
+            } else {
+                throw $exception;
+            }
+        }
+
+    }
+}
--- a/app/Http/Controllers/Api/ComponentsController.php
+++ b/app/Http/Controllers/Api/ComponentsController.php
@@ -0,0 +1,163 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Http\Transformers\AssetsTransformer;
+use App\Http\Transformers\ComponentsTransformer;
+use App\Http\Transformers\ComponentsAssetsTransformer;
+use App\Models\Component;
+use App\Models\Company;
+use App\Helpers\Helper;
+
+class ComponentsController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        $this->authorize('view', Component::class);
+        $components = Company::scopeCompanyables(Component::select('components.*')->whereNull('components.deleted_at')
+            ->with('company', 'location', 'category'));
+
+        if ($request->has('search')) {
+            $components = $components->TextSearch($request->input('search'));
+        }
+
+        $offset = request('offset', 0);
+        $limit = request('limit', 50);
+
+        $allowed_columns = ['id','name','min_amt','order_number','serial','purchase_date','purchase_cost','company','category','qty','location'];
+        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
+
+        switch ($sort) {
+            case 'category':
+                $components = $components->OrderCategory($order);
+                break;
+            case 'location':
+                $components = $components->OrderLocation($order);
+                break;
+            case 'company':
+                $components = $components->OrderCompany($order);
+                break;
+            default:
+                $components = $components->orderBy($sort, $order);
+                break;
+        }
+
+        $total = $components->count();
+        $components = $components->skip($offset)->take($limit)->get();
+        return (new ComponentsTransformer)->transformComponents($components, $total);
+    }
+
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $this->authorize('create', Component::class);
+        $component = new Component;
+        $component->fill($request->all());
+
+        if ($component->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $component, trans('admin/components/message.create.success')));
+        }
+        return response()->json(Helper::formatStandardApiResponse('error', null, $component->getErrors()));
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        $this->authorize('view', Component::class);
+        $component = Component::find($id);
+
+        if ($component) {
+            return (new ComponentsTransformer)->transformComponent($component);
+        }
+        
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/components/message.does_not_exist')));
+    }
+
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        $this->authorize('edit', Component::class);
+        $component = Component::findOrFail($id);
+        $component->fill($request->all());
+
+        if ($component->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $component, trans('admin/components/message.update.success')));
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, $component->getErrors()));
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        $this->authorize('delete', Component::class);
+        $component = Component::findOrFail($id);
+        $this->authorize('delete', $component);
+        $component->delete();
+        return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/components/message.delete.success')));
+    }
+
+    /**
+     * Display all assets attached to a component
+     *
+     * @author [A. Bergamasco] [@vjandrea]
+     * @since [v4.0]
+     * @param Request $request
+     * @param int $id
+     * @return \Illuminate\Http\Response
+    */
+    public function getAssets(Request $request, $id)
+    {
+        $this->authorize('index', Asset::class);
+        
+        $component = Component::findOrFail($id);
+        $assets = $component->assets();
+
+        $offset = request('offset', 0);
+        $limit = $request->input('limit', 50);
+        $total = $assets->count();
+        $assets = $assets->skip($offset)->take($limit)->get();
+        return (new ComponentsAssetsTransformer)->transformAssets($assets, $total);
+    }
+}
--- a/app/Http/Controllers/Api/ConsumablesController.php
+++ b/app/Http/Controllers/Api/ConsumablesController.php
@@ -0,0 +1,151 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Models\Company;
+use App\Models\Consumable;
+use App\Http\Transformers\ConsumablesTransformer;
+use App\Helpers\Helper;
+
+class ConsumablesController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        $this->authorize('index', Consumable::class);
+        $consumables = Company::scopeCompanyables(
+            Consumable::select('consumables.*')
+                ->whereNull('consumables.deleted_at')
+                ->with('company', 'location', 'category', 'users', 'manufacturer')
+        );
+
+        if ($request->has('search')) {
+            $consumables = $consumables->TextSearch(e($request->input('search')));
+        }
+
+        if ($request->has('company_id')) {
+            $consumables->where('company_id','=',$request->input('company_id'));
+        }
+
+        if ($request->has('manufacturer_id')) {
+            $consumables->where('manufacturer_id','=',$request->input('manufacturer_id'));
+        }
+
+
+        $offset = request('offset', 0);
+        $limit = request('limit', 50);
+        $allowed_columns = ['id','name','order_number','min_amt','purchase_date','purchase_cost','company','category','model_number', 'item_no', 'manufacturer','location','qty'];
+        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
+
+
+        switch ($sort) {
+            case 'category':
+                $consumables = $consumables->OrderCategory($order);
+                break;
+            case 'location':
+                $consumables = $consumables->OrderLocation($order);
+                break;
+            case 'manufacturer':
+                $consumables = $consumables->OrderManufacturer($order);
+                break;
+            case 'company':
+                $consumables = $consumables->OrderCompany($order);
+                break;
+            default:
+                $consumables = $consumables->orderBy($sort, $order);
+                break;
+        }
+
+
+
+        $total = $consumables->count();
+        $consumables = $consumables->skip($offset)->take($limit)->get();
+        return (new ConsumablesTransformer)->transformConsumables($consumables, $total);
+
+    }
+
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $this->authorize('create', Consumable::class);
+        $consumable = new Consumable;
+        $consumable->fill($request->all());
+
+        if ($consumable->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $consumable, trans('admin/consumables/message.create.success')));
+        }
+        return response()->json(Helper::formatStandardApiResponse('error', null, $consumable->getErrors()));
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param  int $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        $this->authorize('view', Consumable::class);
+        $consumable = Consumable::findOrFail($id);
+        return (new ConsumablesTransformer)->transformConsumable($consumable);
+    }
+
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request $request
+     * @param  int $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        $this->authorize('edit', Consumable::class);
+        $consumable = Consumable::findOrFail($id);
+        $consumable->fill($request->all());
+
+        if ($consumable->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $consumable, trans('admin/consumables/message.update.success')));
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, $consumable->getErrors()));
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        $this->authorize('delete', Consumable::class);
+        $consumable = Consumable::findOrFail($id);
+        $this->authorize('delete', $consumable);
+        $consumable->delete();
+        return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/consumables/message.delete.success')));
+    }
+}
--- a/app/Http/Controllers/Api/CustomFieldsController.php
+++ b/app/Http/Controllers/Api/CustomFieldsController.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Models\CustomFieldset;
+
+class CustomFieldsController extends Controller
+{
+    /**
+     * Reorder the custom fields within a fieldset
+     *
+     * @author [Brady Wetherington] [<uberbrady@gmail.com>]
+     * @param  int  $id
+     * @since [v3.0]
+     * @return Array
+     */
+    public function postReorder(Request $request, $id)
+    {
+        $fieldset = CustomFieldset::find($id);
+        $fields = array();
+        $order_array = array();
+
+        $items = $request->input('item');
+
+        foreach ($items as $order => $field_id) {
+            $order_array[$field_id] = $order;
+        }
+
+        foreach ($fieldset->fields as $field) {
+            $fields[$field->id] = ['required' => $field->pivot->required, 'order' => $order_array[$field->id]];
+        }
+
+        return $fieldset->fields()->sync($fields);
+
+    }
+
+
+    /**
+     * Delete a custom field.
+     *
+     * @author [Brady Wetherington] [<uberbrady@gmail.com>]
+     * @since [v1.8]
+     * @return Redirect
+     */
+    public function destroy($field_id)
+    {
+        $field = CustomField::find($field_id);
+
+        if ($field->fieldset->count() >0) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, 'Field is in use.'));
+        } else {
+            $field->delete();
+            return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/custom_fields/message.field.delete.success')));
+
+        }
+    }
+
+}
--- a/app/Http/Controllers/Api/CustomFieldsetsController.php
+++ b/app/Http/Controllers/Api/CustomFieldsetsController.php
@@ -0,0 +1,147 @@
+<?php
+namespace App\Http\Controllers\Api;
+
+use View;
+use App\Models\CustomFieldset;
+use App\Models\CustomField;
+use Input;
+use Validator;
+use Redirect;
+use App\Models\AssetModel;
+use Lang;
+use Auth;
+use Illuminate\Http\Request;
+use Log;
+use App\Http\Controllers\Controller;
+use App\Helpers\Helper;
+use App\Http\Transformers\CustomFieldsTransformer;
+use App\Http\Transformers\CustomFieldsetsTransformer;
+use App\Http\Requests\AssetRequest;
+
+/**
+ * This controller handles all actions related to Custom Asset Fieldsets for
+ * the Snipe-IT Asset Management application.
+ *
+ * @todo Improve documentation here.
+ * @todo Check for raw DB queries and try to convert them to query builder statements
+ * @version    v2.0
+ * @author [Brady Wetherington] [<uberbrady@gmail.com>]
+ * @author [Josh Gibson]
+ */
+
+class CustomFieldsetsController extends Controller
+{
+
+    /**
+    * Shows the given fieldset and its fields
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @author [Josh Gibson]
+    * @param int $id
+    * @since [v1.8]
+    * @return View
+    */
+    public function index()
+    {
+        $this->authorize('index', CustomFieldset::class);
+        $fieldsets = CustomFieldset::withCount(['fields', 'models'])->get();
+
+        $total = count($fieldsets);
+        return (new CustomFieldsetsTransformer)->transformCustomFieldsets($fieldsets, $total);
+
+    }
+
+    /**
+    * Shows the given fieldset and its fields
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @author [Josh Gibson]
+    * @param int $id
+    * @since [v1.8]
+    * @return View
+    */
+    public function show($id)
+    {
+      $this->authorize('show', CustomFieldset::class);
+        if ($fieldset = CustomFieldset::find($id)) {
+            return (new CustomFieldsetsTransformer)->transformCustomFieldset($fieldset);
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/custom_fields/message.fieldset.does_not_exist')), 200);
+
+    }
+
+
+     /**
+     * Update the specified resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        $this->authorize('edit', CustomFieldset::class);
+        $fieldset = CustomFieldset::findOrFail($id);
+        $fieldset->fill($request->all());
+
+        if ($fieldset->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $fieldset, trans('admin/custom_fields/message.fieldset.update.success')));
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, $fieldset->getErrors()));
+    }
+
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $this->authorize('create', CustomFieldset::class);
+        $fieldset = new CustomFieldset;
+        $fieldset->fill($request->all());
+
+        if ($fieldset->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $fieldset, trans('admin/custom_fields/message.fieldset.create.success')));
+        }
+        return response()->json(Helper::formatStandardApiResponse('error', null, $fieldset->getErrors()));
+
+    }
+
+
+    /**
+     * Delete a custom fieldset.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return Redirect
+     */
+    public function destroy($id)
+    {
+        $this->authorize('delete', CustomFieldset::class);
+        $fieldset = CustomFieldset::findOrFail($id);
+        
+        $modelsCount = $fieldset->models->count();
+        $fieldsCount = $fieldset->fields->count();
+
+        if (($modelsCount > 0) || ($fieldsCount > 0) ){
+            return response()->json(Helper::formatStandardApiResponse('error', null, 'Fieldset is in use.'));
+        }
+
+         if ($fieldset->delete()) {
+             return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/custom_fields/message.fieldset.delete.success')));
+         }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, 'Unspecified error'));
+
+
+        
+    }
+
+}
--- a/app/Http/Controllers/Api/DepartmentsController.php
+++ b/app/Http/Controllers/Api/DepartmentsController.php
@@ -0,0 +1,113 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Models\Department;
+use App\Http\Transformers\DepartmentsTransformer;
+use App\Helpers\Helper;
+use Auth;
+
+class DepartmentsController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        $this->authorize('view', Department::class);
+        $allowed_columns = ['id','name'];
+
+        $departments = Department::select([
+            'id',
+            'name',
+            'location_id',
+            'company_id',
+            'manager_id',
+            'created_at',
+            'updated_at'
+        ])->with('users')->with('location')->with('manager')->with('company')->withCount('users');
+
+        if ($request->has('search')) {
+            $departments = $departments->TextSearch($request->input('search'));
+        }
+
+        $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';
+        $departments->orderBy($sort, $order);
+
+        $total = $departments->count();
+        $departments = $departments->skip($offset)->take($limit)->get();
+        return (new DepartmentsTransformer)->transformDepartments($departments, $total);
+
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $this->authorize('create', Department::class);
+        $department = new Department;
+        $department->fill($request->all());
+        $department->user_id = Auth::user()->id;
+        $department->manager_id = ($request->has('manager_id' ) ? $request->input('manager_id') : null);
+
+        if ($department->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $department, trans('admin/departments/message.create.success')));
+        }
+        return response()->json(Helper::formatStandardApiResponse('error', null, $department->getErrors()));
+
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        $this->authorize('view', Department::class);
+        $department = Department::findOrFail($id);
+        return (new DepartmentsTransformer)->transformDepartment($department);
+    }
+
+
+
+    /**
+     * Validates and deletes selected location.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param int $locationId
+     * @since [v1.0]
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy($id)
+    {
+        $department = Department::findOrFail($id);
+
+        if ($department->users->count() > 0) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/departments/message.assoc_users')));
+        }
+
+        $department->delete();
+        return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/departments/message.delete.success')));
+
+    }
+
+}
--- a/app/Http/Controllers/Api/DepreciationsController.php
+++ b/app/Http/Controllers/Api/DepreciationsController.php
@@ -0,0 +1,127 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Helpers\Helper;
+use App\Models\Depreciation;
+use App\Http\Transformers\DepreciationsTransformer;
+
+class DepreciationsController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        $this->authorize('view', Depreciation::class);
+        $allowed_columns = ['id','name','created_at'];
+
+        $depreciations = Depreciation::select('id','name','months','user_id','created_at','updated_at');
+
+        if ($request->has('search')) {
+            $depreciations = $depreciations->TextSearch($request->input('search'));
+        }
+
+        $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';
+        $depreciations->orderBy($sort, $order);
+
+        $total = $depreciations->count();
+        $depreciations = $depreciations->skip($offset)->take($limit)->get();
+        return (new DepreciationsTransformer)->transformDepreciations($depreciations, $total);
+    }
+
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $this->authorize('create', Depreciation::class);
+        $depreciation = new Depreciation;
+        $depreciation->fill($request->all());
+
+        if ($depreciation->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $depreciation, trans('admin/depreciations/message.create.success')));
+        }
+        return response()->json(Helper::formatStandardApiResponse('error', null, $depreciation->getErrors()));
+
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        $this->authorize('view', Depreciation::class);
+        $depreciation = Depreciation::findOrFail($id);
+        return (new DepreciationsTransformer)->transformDepreciation($depreciation);
+    }
+
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        $this->authorize('edit', Depreciation::class);
+        $depreciation = Depreciation::findOrFail($id);
+        $depreciation->fill($request->all());
+
+        if ($depreciation->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $depreciation, trans('admin/depreciations/message.update.success')));
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, $depreciation->getErrors()));
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        $this->authorize('delete', Depreciation::class);
+        $depreciation = Depreciation::findOrFail($id);
+        $this->authorize('delete', $depreciation);
+
+        if ($depreciation->has_models() > 0) {
+            return response()->json(Helper::formatStandardApiResponse('error', trans('admin/depreciations/message.assoc_users')));
+        }
+
+        $depreciation->delete();
+        return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/depreciations/message.delete.success')));
+
+    }
+
+
+
+}
--- a/app/Http/Controllers/Api/GroupsController.php
+++ b/app/Http/Controllers/Api/GroupsController.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Helpers\Helper;
+use App\Models\Group;
+use App\Http\Transformers\GroupsTransformer;
+
+class GroupsController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        $this->authorize('view', Group::class);
+        $allowed_columns = ['id','name','created_at'];
+
+        $groups = Group::select('id','name','permissions','created_at','updated_at')->withCount('users');
+
+        if ($request->has('search')) {
+            $groups = $groups->TextSearch($request->input('search'));
+        }
+
+        $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';
+        $groups->orderBy($sort, $order);
+
+        $total = $groups->count();
+        $groups = $groups->skip($offset)->take($limit)->get();
+        return (new GroupsTransformer)->transformGroups($groups, $total);
+    }
+
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $this->authorize('create', Group::class);
+        $group = new Group;
+        $group->fill($request->all());
+
+        if ($group->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $group, trans('admin/groups/message.create.success')));
+        }
+        return response()->json(Helper::formatStandardApiResponse('error', null, $group->getErrors()));
+
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        $this->authorize('view', Group::class);
+        $group = Group::findOrFail($id);
+        return $group;
+    }
+
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        $this->authorize('edit', Group::class);
+        $group = Group::findOrFail($id);
+        $group->fill($request->all());
+
+        if ($group->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $group, trans('admin/groups/message.update.success')));
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, $group->getErrors()));
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        $this->authorize('delete', Group::class);
+        $group = Group::findOrFail($id);
+        $this->authorize('delete', $group);
+        $group->delete();
+        return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/groups/message.delete.success')));
+
+    }
+
+
+}
--- a/app/Http/Controllers/Api/ImportController.php
+++ b/app/Http/Controllers/Api/ImportController.php
@@ -0,0 +1,147 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Helpers\Helper;
+use App\Http\Controllers\Controller;
+use App\Http\Requests\ItemImportRequest;
+use App\Http\Transformers\ImportsTransformer;
+use App\Models\Company;
+use App\Models\Import;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Session;
+use League\Csv\Reader;
+use Symfony\Component\HttpFoundation\File\Exception\FileException;
+
+class ImportController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        //
+        $imports = Import::latest()->get();
+        return (new ImportsTransformer)->transformImports($imports);
+
+    }
+
+    /**
+     * Process and store a CSV upload file.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store()
+    {
+        //
+        if (!Company::isCurrentUserAuthorized()) {
+            return redirect()->route('hardware.index')->with('error', trans('general.insufficient_permissions'));
+        } elseif (!config('app.lock_passwords')) {
+            $files = Input::file('files');
+            $path = config('app.private_uploads').'/imports';
+            $results = [];
+            $import = new Import;
+            foreach ($files as $file) {
+                if (!in_array($file->getMimeType(), array(
+                    'application/vnd.ms-excel',
+                    'text/csv',
+                    'text/plain',
+                    'text/comma-separated-values',
+                    'text/tsv'))) {
+                    $results['error']='File type must be CSV';
+                    return response()->json(Helper::formatStandardApiResponse('error', null, $results['error']), 500);
+                }
+
+                $date = date('Y-m-d-his');
+                $fixed_filename = str_slug($file->getClientOriginalName());
+                try {
+                    $file->move($path, $date.'-'.$fixed_filename);
+                } catch (FileException $exception) {
+                    $results['error']=trans('admin/hardware/message.upload.error');
+                    if (config('app.debug')) {
+                        $results['error'].= ' ' . $exception->getMessage();
+                    }
+                    return response()->json(Helper::formatStandardApiResponse('error', null, $results['error']), 500);
+                }
+                $file_name = date('Y-m-d-his').'-'.$fixed_filename;
+                $import->file_path = $file_name;
+                $import->filesize = filesize($path.'/'.$file_name);
+                //TODO: is there a lighter way to do this?
+                $reader = Reader::createFromPath("{$path}/{$file_name}");
+                $import->header_row = $reader->fetchOne(0);
+                // Grab the first row to display via ajax as the user picks fields
+                $import->first_row = $reader->fetchOne(1);
+                $import->save();
+                $results[] = $import;
+            }
+            $results = (new ImportsTransformer)->transformImports($results);
+            return [
+                'files' => $results,
+            ];
+        }
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.feature_disabled')), 500);
+    }
+    /**
+     * Processes the specified Import.
+     *
+     * @param  \App\Import  $import
+     * @return \Illuminate\Http\Response
+     */
+    public function process(ItemImportRequest $request, $import_id)
+    {
+        $this->authorize('create', Asset::class);
+        $errors = $request->import(Import::find($import_id));
+        $redirectTo = "hardware.index";
+        switch ($request->get('import-type')) {
+            case "asset":
+                $redirectTo = "hardware.index";
+                break;
+            case "accessory":
+                $redirectTo = "accessories.index";
+                break;
+            case "consumable":
+                $redirectTo = "consumables.index";
+                break;
+            case "component":
+                $redirectTo = "components.index";
+                break;
+            case "license":
+                $redirectTo = "licenses.index";
+                break;
+            case "user":
+                $redirectTo = "users.index";
+                break;
+        }
+
+        if ($errors) { //Failure
+            return response()->json(Helper::formatStandardApiResponse('import-errors', null, $errors), 500);
+        }
+        //Flash message before the redirect
+        Session::flash('success', trans('admin/hardware/message.import.success'));
+        return response()->json(Helper::formatStandardApiResponse('success', null, ['redirect_url' => route($redirectTo)]));
+
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\Import  $import
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($import_id)
+    {
+        $this->authorize('create', Asset::class);
+        $import = Import::find($import_id);
+        try {
+            unlink(config('app.private_uploads').'/imports/'.$import->file_path);
+            $import->delete();
+            return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/hardware/message.import.file_delete_success')));
+        } catch (\Exception $e) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.import.file_delete_error')), 500);
+        }
+    }
+}
--- a/app/Http/Controllers/Api/LicensesController.php
+++ b/app/Http/Controllers/Api/LicensesController.php
@@ -0,0 +1,164 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Http\Transformers\LicensesTransformer;
+use App\Models\License;
+use App\Models\Company;
+
+class LicensesController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        $this->authorize('view', License::class);
+        $licenses = Company::scopeCompanyables(License::with('company', 'licenseSeatsRelation', 'manufacturer'));
+
+        if ($request->has('search')) {
+            $licenses = $licenses->TextSearch($request->input('search'));
+        }
+
+        if ($request->has('company_id')) {
+            $licenses->where('company_id','=',$request->input('company_id'));
+        }
+
+        if ($request->has('name')) {
+            $licenses->where('licenses.name','=',$request->input('name'));
+        }
+
+        if ($request->has('product_key')) {
+            $licenses->where('licenses.serial','=',$request->input('product_key'));
+        }
+
+        if ($request->has('order_number')) {
+            $licenses->where('order_number','=',$request->input('order_number'));
+        }
+
+        if ($request->has('purchase_order')) {
+            $licenses->where('purchase_order','=',$request->input('purchase_order'));
+        }
+
+        if ($request->has('license_name')) {
+            $licenses->where('license_name','=',$request->input('license_name'));
+        }
+
+        if ($request->has('license_email')) {
+            $licenses->where('license_email','=',$request->input('license_email'));
+        }
+
+        if ($request->has('manufacturer_id')) {
+            $licenses->where('manufacturer_id','=',$request->input('manufacturer_id'));
+        }
+
+        if ($request->has('supplier_id')) {
+            $licenses->where('supplier_id','=',$request->input('supplier_id'));
+        }
+
+        if ($request->has('depreciation_id')) {
+            $licenses->where('depreciation_id','=',$request->input('depreciation_id'));
+        }
+
+        if ($request->has('supplier_id')) {
+            $licenses->where('supplier_id','=',$request->input('supplier_id'));
+        }
+
+        $offset = request('offset', 0);
+        $limit = request('limit', 50);
+        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
+
+
+        switch ($request->input('sort')) {
+            case 'manufacturer':
+                $licenses = $licenses->OrderManufacturer($order);
+                break;
+            case 'supplier':
+                $licenses = $licenses->OrderSupplier($order);
+                break;
+            case 'company':
+                $licenses = $licenses->OrderCompany($order);
+                break;
+            default:
+                $allowed_columns = ['id','name','purchase_cost','expiration_date','purchase_order','order_number','notes','purchase_date','serial','company','license_name','license_email'];
+                $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';
+                $licenses = $licenses->orderBy($sort, $order);
+                break;
+        }
+        
+
+        $total = $licenses->count();
+        $licenses = $licenses->skip($offset)->take($limit)->get();
+        return (new LicensesTransformer)->transformLicenses($licenses, $total);
+
+    }
+
+
+
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        $license = License::find($id);
+        if (isset($license->id)) {
+            $license = $license->load('assignedusers', 'licenseSeats.user', 'licenseSeats.asset');
+            $this->authorize('view', $license);
+            return (new LicensesTransformer)->transformLicense($license);
+        }
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/licenses/message.does_not_exist')), 200);
+    }
+
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        //
+    }
+}
--- a/app/Http/Controllers/Api/LocationsController.php
+++ b/app/Http/Controllers/Api/LocationsController.php
@@ -0,0 +1,134 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Helpers\Helper;
+use App\Models\Location;
+use App\Http\Transformers\LocationsTransformer;
+
+class LocationsController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        $this->authorize('view', Location::class);
+        $allowed_columns = ['id','name','address','address2','city','state','country','zip','created_at',
+        'updated_at','parent_id'];
+
+        $locations = Location::select([
+            'locations.id',
+            'locations.name',
+            'locations.address',
+            'locations.address2',
+            'locations.city',
+            'locations.state',
+            'locations.zip',
+            'locations.country',
+            'locations.parent_id',
+            'locations.created_at',
+            'locations.updated_at',
+            'locations.currency'
+        ])->withCount('assets')->withCount('users');
+
+        if ($request->has('search')) {
+            $locations = $locations->TextSearch($request->input('search'));
+        }
+
+        $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';
+        $locations->orderBy($sort, $order);
+
+        $total = $locations->count();
+        $locations = $locations->skip($offset)->take($limit)->get();
+        return (new LocationsTransformer)->transformLocations($locations, $total);
+
+    }
+
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $this->authorize('create', Location::class);
+        $location = new Location;
+        $location->fill($request->all());
+
+        if ($location->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', (new LocationsTransformer)->transformLocation($location), trans('admin/locations/message.create.success')));
+        }
+        return response()->json(Helper::formatStandardApiResponse('error', null, $location->getErrors()));
+
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        $this->authorize('view', Location::class);
+        $location = Location::findOrFail($id);
+        return (new LocationsTransformer)->transformLocation($location);
+    }
+
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        $this->authorize('edit', Location::class);
+        $location = Location::findOrFail($id);
+        $location->fill($request->all());
+
+        if ($location->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success',  (new LocationsTransformer)->transformLocation($location), trans('admin/locations/message.update.success')));
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, $location->getErrors()));
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        $this->authorize('delete', Location::class);
+        $location = Location::findOrFail($id);
+        $this->authorize('delete', $location);
+        $location->delete();
+        return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/locations/message.delete.success')));
+
+    }
+}
--- a/app/Http/Controllers/Api/ManufacturersController.php
+++ b/app/Http/Controllers/Api/ManufacturersController.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Helpers\Helper;
+use App\Models\Manufacturer;
+use App\Http\Transformers\DatatablesTransformer;
+use App\Http\Transformers\ManufacturersTransformer;
+
+class ManufacturersController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        $this->authorize('view', Manufacturer::class);
+        $allowed_columns = ['id','name','url','support_url','support_email','support_phone','created_at','updated_at'];
+
+        $manufacturers = Manufacturer::select(
+            array('id','name','url','support_url','support_email','support_phone','created_at','updated_at')
+        )->withCount('assets')->withCount('licenses')->withCount('consumables')->withCount('accessories');
+
+
+        if ($request->has('search')) {
+            $manufacturers = $manufacturers->TextSearch($request->input('search'));
+        }
+
+        $offset = request('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';
+        $manufacturers->orderBy($sort, $order);
+
+        $total = $manufacturers->count();
+        $manufacturers = $manufacturers->skip($offset)->take($limit)->get();
+        return (new ManufacturersTransformer)->transformManufacturers($manufacturers, $total);
+    }
+
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $this->authorize('create', Manufacturer::class);
+        $manufacturer = new Manufacturer;
+        $manufacturer->fill($request->all());
+
+        if ($manufacturer->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $manufacturer, trans('admin/manufacturers/message.create.success')));
+        }
+        return response()->json(Helper::formatStandardApiResponse('error', null, $manufacturer->getErrors()));
+
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        $this->authorize('view', Manufacturer::class);
+        $manufacturer = Manufacturer::findOrFail($id);
+        return (new ManufacturersTransformer)->transformManufacturer($manufacturer);
+    }
+
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        $this->authorize('edit', Manufacturer::class);
+        $manufacturer = Manufacturer::findOrFail($id);
+        $manufacturer->fill($request->all());
+
+        if ($manufacturer->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $manufacturer, trans('admin/manufacturers/message.update.success')));
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, $manufacturer->getErrors()));
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        $this->authorize('delete', Manufacturer::class);
+        $manufacturer = Manufacturer::findOrFail($id);
+        $this->authorize('delete', $manufacturer);
+        $manufacturer->delete();
+        return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/manufacturers/message.delete.success')));
+
+    }
+}
--- a/app/Http/Controllers/Api/ReportsController.php
+++ b/app/Http/Controllers/Api/ReportsController.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Models\Actionlog;
+use App\Http\Transformers\ActionlogsTransformer;
+
+class ReportsController extends Controller
+{
+    /**
+     * Returns Activity Report JSON.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return View
+     */
+    public function index(Request $request)
+    {
+
+        $actionlogs = Actionlog::with('item', 'user', 'target');
+
+        if ($request->has('search')) {
+            $actionlogs = $actionlogs->TextSearch(e($request->input('search')));
+        }
+
+        if (($request->has('target_type'))  && ($request->has('target_id'))) {
+            $actionlogs = $actionlogs->where('target_id','=',$request->input('target_id'))
+                ->where('target_type','=',"App\\Models\\".ucwords($request->input('target_type')));
+
+        }
+
+        if (($request->has('item_type'))  && ($request->has('item_id'))) {
+            $actionlogs = $actionlogs->where('item_id','=',$request->input('item_id'))
+                ->where('item_type','=',"App\\Models\\".ucwords($request->input('item_type')));
+        }
+
+        $allowed_columns = [
+            'id',
+            'created_at'
+        ];
+        
+        $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';
+        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
+        $offset = request('offset', 0);
+        $limit = request('limit', 50);
+        $total = $actionlogs->count();
+        $actionlogs = $actionlogs->orderBy($sort, $order);
+        $actionlogs = $actionlogs->skip($offset)->take($limit)->get();
+        return (new ActionlogsTransformer)->transformActionlogs($actionlogs, $total);
+
+
+
+    }
+}
--- a/app/Http/Controllers/Api/SettingsController.php
+++ b/app/Http/Controllers/Api/SettingsController.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Models\Ldap;
+
+class SettingsController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        //
+    }
+
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        //
+    }
+
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        //
+    }
+
+    public function getLdapTest()
+    {
+        \Log::debug('Preparing to test LDAP connection');
+
+        try {
+            $connection = Ldap::connectToLdap();
+            try {
+                \Log::debug('attempting to bind to LDAP for LDAP test');
+                Ldap::bindAdminToLdap($connection);
+                return response()->json(['message' => 'It worked!'], 200);
+            } 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()], 600);
+        }
+
+
+    }
+
+}
--- a/app/Http/Controllers/Api/StatuslabelsController.php
+++ b/app/Http/Controllers/Api/StatuslabelsController.php
@@ -0,0 +1,239 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Helpers\Helper;
+use App\Models\Statuslabel;
+use App\Models\Asset;
+use App\Http\Transformers\StatuslabelsTransformer;
+use App\Http\Transformers\AssetsTransformer;
+
+class StatuslabelsController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        $this->authorize('view', Statuslabel::class);
+        $allowed_columns = ['id','name','created_at'];
+
+        $statuslabels = Statuslabel::withCount('assets');
+
+        if ($request->has('search')) {
+            $statuslabels = $statuslabels->TextSearch($request->input('search'));
+        }
+
+        $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';
+        $statuslabels->orderBy($sort, $order);
+
+        $total = $statuslabels->count();
+        $statuslabels = $statuslabels->skip($offset)->take($limit)->get();
+        return (new StatuslabelsTransformer)->transformStatuslabels($statuslabels, $total);
+    }
+
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $this->authorize('create', Statuslabel::class);
+        $request->except('deployable', 'pending','archived');
+
+        if (!$request->has('type')) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, ["type" => ["Status label type is required."]]));
+        }
+
+        $statuslabel = new Statuslabel;
+        $statuslabel->fill($request->all());
+
+        $statusType = Statuslabel::getStatuslabelTypesForDB($request->input('type'));
+        $statuslabel->deployable        =  $statusType['deployable'];
+        $statuslabel->pending           =  $statusType['pending'];
+        $statuslabel->archived          =  $statusType['archived'];
+
+        if ($statuslabel->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $statuslabel, trans('admin/statuslabels/message.create.success')));
+        }
+        return response()->json(Helper::formatStandardApiResponse('error', null, $statuslabel->getErrors()));
+
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        $this->authorize('view', Statuslabel::class);
+        $statuslabel = Statuslabel::findOrFail($id);
+        return (new StatuslabelsTransformer)->transformStatuslabel($statuslabel);
+    }
+
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        $this->authorize('edit', Statuslabel::class);
+        $statuslabel = Statuslabel::findOrFail($id);
+        
+        $request->except('deployable', 'pending','archived');
+
+        if (!$request->has('type')) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, 'Status label type is required.'));
+        }
+
+        $statuslabel->fill($request->all());
+
+        $statusType = Statuslabel::getStatuslabelTypesForDB($request->input('type'));
+        $statuslabel->deployable        =  $statusType['deployable'];
+        $statuslabel->pending           =  $statusType['pending'];
+        $statuslabel->archived          =  $statusType['archived'];
+
+        if ($statuslabel->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $statuslabel, trans('admin/statuslabels/message.update.success')));
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, $statuslabel->getErrors()));
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        $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')));
+
+    }
+
+
+
+     /**
+     * Show a count of assets by status label for pie chart
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.0]
+     * @return \Illuminate\Http\Response
+     */
+
+    public function getAssetCountByStatuslabel()
+    {
+
+        $statusLabels = Statuslabel::with('assets')->get();
+        $labels=[];
+        $points=[];
+        $colors=[];
+        foreach ($statusLabels as $statusLabel) {
+            if ($statusLabel->assets()->count() > 0) {
+                $labels[]=$statusLabel->name;
+                $points[]=$statusLabel->assets()->whereNull('assigned_to')->count();
+                if ($statusLabel->color!='') {
+                    $colors[]=$statusLabel->color;
+                }
+            }
+        }
+        $labels[]='Deployed';
+        $points[]=Asset::whereNotNull('assigned_to')->count();
+
+        $colors_array = array_merge($colors, Helper::chartColors());
+
+        $result= [
+            "labels" => $labels,
+            "datasets" => [ [
+                "data" => $points,
+                "backgroundColor" => $colors_array,
+                "hoverBackgroundColor" =>  $colors_array
+            ]]
+        ];
+        return $result;
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function assets(Request $request, $id)
+    {
+        $this->authorize('view', Statuslabel::class);
+        $this->authorize('index', Asset::class);
+        $assets = Asset::where('status_id','=',$id);
+
+        $allowed_columns = [
+            'id',
+            'name'
+        ];
+
+        $offset = request('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';
+        $assets->orderBy($sort, $order);
+
+        $total = $assets->count();
+        $assets = $assets->skip($offset)->take($limit)->get();
+
+
+        return (new AssetsTransformer)->transformAssets($assets, $total);
+    }
+
+
+    /**
+     * Returns a boolean response based on whether the status label
+     * is one that is deployable.
+     *
+     * This is used by the hardware create/edit view to determine whether
+     * we should provide a dropdown of users for them to check the asset out to.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return Bool
+     */
+    public function checkIfDeployable($id) {
+        $statuslabel = Statuslabel::findOrFail($id);
+        if ($statuslabel->getStatuslabelType()=='deployable') {
+            return '1';
+        }
+
+        return '0';
+    }
+}
--- a/app/Http/Controllers/Api/SuppliersController.php
+++ b/app/Http/Controllers/Api/SuppliersController.php
@@ -0,0 +1,122 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Helpers\Helper;
+use App\Models\Supplier;
+use App\Http\Transformers\SuppliersTransformer;
+
+class SuppliersController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        $this->authorize('view', Supplier::class);
+        $allowed_columns = ['id','name','address','phone','contact','fax','email'];
+        
+        $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');
+
+
+        if ($request->has('search')) {
+            $suppliers = $suppliers->TextSearch($request->input('search'));
+        }
+
+        $offset = request('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';
+        $suppliers->orderBy($sort, $order);
+
+        $total = $suppliers->count();
+        $suppliers = $suppliers->skip($offset)->take($limit)->get();
+        return (new SuppliersTransformer)->transformSuppliers($suppliers, $total);
+    }
+
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $this->authorize('create', Supplier::class);
+        $supplier = new Supplier;
+        $supplier->fill($request->all());
+
+        if ($supplier->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $supplier, trans('admin/suppliers/message.create.success')));
+        }
+        return response()->json(Helper::formatStandardApiResponse('error', null, $supplier->getErrors()));
+
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        $this->authorize('view', Supplier::class);
+        $supplier = Supplier::findOrFail($id);
+        return (new SuppliersTransformer)->transformSupplier($supplier);
+    }
+
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        $this->authorize('edit', Supplier::class);
+        $supplier = Supplier::findOrFail($id);
+        $supplier->fill($request->all());
+
+        if ($supplier->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $supplier, trans('admin/suppliers/message.update.success')));
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, $supplier->getErrors()));
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        $this->authorize('delete', Supplier::class);
+        $supplier = Supplier::findOrFail($id);
+        $this->authorize('delete', $supplier);
+        $supplier->delete();
+        return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/suppliers/message.delete.success')));
+
+    }
+}
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -0,0 +1,185 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Http\Transformers\UsersTransformer;
+use App\Models\Company;
+use App\Models\User;
+use App\Helpers\Helper;
+use App\Http\Requests\SaveUserRequest;
+
+class UsersController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        $this->authorize('view', User::class);
+
+        $users = User::select([
+            'users.id',
+            'users.employee_num',
+            'users.two_factor_enrolled',
+            'users.jobtitle',
+            'users.email',
+            'users.username',
+            'users.location_id',
+            'users.manager_id',
+            'users.first_name',
+            'users.last_name',
+            'users.created_at',
+            'users.notes',
+            'users.company_id',
+            'users.last_login',
+            'users.deleted_at',
+            'users.department_id',
+            'users.activated'
+        ])->with('manager', 'groups', 'userloc', 'company', 'department','throttle','assets','licenses','accessories','consumables')
+            ->withCount('assets','licenses','accessories','consumables');
+        $users = Company::scopeCompanyables($users);
+
+
+        if ($request->has('search')) {
+            $users = $users->TextSearch($request->input('search'));
+        }
+
+        if ($request->has('company_id')) {
+            $users = $users->where('company_id', '=', $request->input('company_id'));
+        }
+
+        if ($request->has('location_id')) {
+            $users = $users->where('location_id', '=', $request->input('location_id'));
+        }
+
+        if ($request->has('department_id')) {
+            $users = $users->where('department_id','=',$request->input('department_id'));
+        }
+
+        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
+        $offset = request('offset', 0);
+        $limit = request('limit', 50);
+
+        switch ($request->input('sort')) {
+            case 'manager':
+                $users = $users->OrderManager($order);
+                break;
+            case 'location':
+                $users = $users->OrderLocation($order);
+                break;
+            case 'department':
+                $users = $users->OrderDepartment($order);
+                break;
+            default:
+                $allowed_columns =
+                    [
+                        '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'
+                    ];
+
+                $sort = in_array($request->get('sort'), $allowed_columns) ? $request->get('sort') : 'first_name';
+                $users = $users->orderBy($sort, $order);
+                break;
+        }
+        $total = $users->count();
+        $users = $users->skip($offset)->take($limit)->get();
+        return (new UsersTransformer)->transformUsers($users, $total);
+    }
+
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(SaveUserRequest $request)
+    {
+        $this->authorize('view', User::class);
+        $user = new User;
+        $user->fill($request->all());
+        $user->password = bcrypt($request->input('password'));
+
+        if ($user->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', (new UsersTransformer)->transformUser($user), trans('admin/users/message.create.success')));
+        }
+        return response()->json(Helper::formatStandardApiResponse('error', null, $user->getErrors()));
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        $this->authorize('view', User::class);
+        $user = User::findOrFail($id);
+        return (new UsersTransformer)->transformUser($user);
+    }
+
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(SaveUserRequest $request, $id)
+    {
+        $this->authorize('edit', User::class);
+        $user = User::findOrFail($id);
+        $user->fill($request->all());
+
+        if ($request->has('password')) {
+            $user->password = bcrypt($request->input('password'));
+        }
+
+
+        if ($user->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', (new UsersTransformer)->transformUser($user), trans('admin/users/message.success.update')));
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, $user->getErrors()));
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        $this->authorize('delete', User::class);
+        $user = User::findOrFail($id);
+        $this->authorize('delete', $user);
+
+
+        if ($user->assets()->count() > 0) {
+            return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/users/message.error.delete_has_assets')));
+        }
+
+        if ($user->delete()) {
+            return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/users/message.success.delete')));
+        }
+        return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/users/message.error.delete')));
+    }
+}
--- a/app/Http/Controllers/AssetMaintenancesController.php
+++ b/app/Http/Controllers/AssetMaintenancesController.php
@@ -9,11 +9,9 @@ use Input;
 use Lang;
 use Log;
 use Mail;
-use Redirect;
 use Response;
 use Slack;
 use Str;
-use App\Models\Supplier;
 use TCPDF;
 use Validator;
 use View;
@@ -22,6 +20,7 @@ use App\Models\Asset;
 use App\Helpers\Helper;
 use Auth;
 use Gate;
+use Illuminate\Http\Request;

 /**
 * This controller handles all actions related to Asset Maintenance for
@@ -43,7 +42,7 @@ class AssetMaintenancesController extends Controller
    */
    private static function getInsufficientPermissionsRedirect()
    {
-        return redirect()->route('asset_maintenances')
+        return redirect()->route('maintenances.index')
          ->with('error', trans('general.insufficient_permissions'));
    }

@@ -58,10 +57,9 @@ class AssetMaintenancesController extends Controller
    * @since [v1.8]
    * @return View
    */
-    public function getIndex()
+    public function index()
    {
-
-        return View::make('asset_maintenances/index');
+        return view('asset_maintenances/index');
    }


@@ -74,34 +72,20 @@ class AssetMaintenancesController extends Controller
    * @since [v1.8]
    * @return String JSON
    */
-    public function getDatatable()
+    public function getDatatable(Request $request)
    {
-        $maintenances = AssetMaintenance::with('asset', 'supplier', 'asset.company','admin');
+        $maintenances = AssetMaintenance::with('asset', 'supplier', 'asset.company', 'admin');

        if (Input::has('search')) {
-            $maintenances = $maintenances->TextSearch(e(Input::get('search')));
+            $maintenances = $maintenances->TextSearch(e($request->input('search')));
        }

-
-
-
-        if (Input::has('offset')) {
-            $offset = e(Input::get('offset'));
-        } else {
-            $offset = 0;
-        }
-
-        if (Input::has('limit')) {
-            $limit = e(Input::get('limit'));
-        } else {
-            $limit = 50;
-        }
-
-
+        $offset = request('offset', 0);
+        $limit = request('limit', 50);

        $allowed_columns = ['id','title','asset_maintenance_time','asset_maintenance_type','cost','start_date','completion_date','notes','user_id'];
        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array(Input::get('sort'), $allowed_columns) ? e(Input::get('sort')) : 'created_at';
+        $sort = in_array(Input::get('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';

        switch ($sort) {
            case 'user_id':
@@ -120,10 +104,15 @@ class AssetMaintenancesController extends Controller

        foreach ($maintenances as $maintenance) {
            $actions = '';
-            if (Gate::allows('assets.edit')) {
-                $actions .= '<nobr><a href="' . route('update/asset_maintenance',
-                        $maintenance->id) . '" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/asset_maintenance',
-                        $maintenance->id) . '" data-content="' . trans('admin/asset_maintenances/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($maintenance->title) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></nobr>';
+            if (Gate::allows('update', Asset::class)) {
+                $actions .= Helper::generateDatatableButton('edit', route('maintenances.edit', $maintenance->id));
+                $actions .= Helper::generateDatatableButton(
+                    'delete',
+                    route('maintenances.destroy', $maintenance->id),
+                    $enabled = true,
+                    trans('admin/asset_maintenances/message.delete.confirm'),
+                    $maintenance->title
+                );
            }

            if (($maintenance->cost) && (isset($maintenance->asset)) && ($maintenance->asset->assetloc) &&  ($maintenance->asset->assetloc->currency!='')) {
@@ -131,21 +120,21 @@ class AssetMaintenancesController extends Controller
            } else {
                $maintenance_cost = $settings->default_currency.$maintenance->cost;
            }
-            
+
            $rows[] = array(
                'id'            => $maintenance->id,
-                'asset_name'    =>  ($maintenance->asset) ? (string)link_to('/hardware/'.$maintenance->asset->id.'/view', $maintenance->asset->showAssetName()) : 'Deleted Asset' ,
+                'asset_name'    =>  ($maintenance->asset) ? (string)link_to_route('maintenances.show', $maintenance->asset->present()->Name(), ['maintenance' => $maintenance->asset->id]) : 'Deleted Asset' ,
                'title'         => $maintenance->title,
                'notes'         => $maintenance->notes,
-                'supplier'      => ($maintenance->supplier) ? (string)link_to('/admin/settings/suppliers/'.$maintenance->supplier->id.'/view', $maintenance->supplier->name) : 'Deleted Supplier',
+                'supplier'      => ($maintenance->supplier) ? (string)link_to_route('suppliers.show', $maintenance->supplier->name, ['maintenance'=>$maintenance->supplier->id]) : 'Deleted Supplier',
                'cost'          => $maintenance_cost,
                'asset_maintenance_type'          => e($maintenance->asset_maintenance_type),
                'start_date'         => $maintenance->start_date,
                'asset_maintenance_time'          => $maintenance->asset_maintenance_time,
                'completion_date'     => $maintenance->completion_date,
-                'user_id'       => ($maintenance->admin) ? (string)link_to('/admin/users/'.$maintenance->admin->id.'/view', $maintenance->admin->fullName()) : '',
+                'user_id'       => ($maintenance->admin) ? (string)link_to_route('users.show', $maintenance->admin->present()->fullName(), ['user'=>$maintenance->admin->id]) : '',
                'actions'       => $actions,
-                'companyName'   => ($maintenance->asset->company) ? $maintenance->asset->company->name : ''
+                'company'   => ($maintenance->asset->company) ? $maintenance->asset->company->name : ''
            );
        }

@@ -155,32 +144,26 @@ class AssetMaintenancesController extends Controller
    }

    /**
-    *  Returns a form view to create a new asset maintenance.
-    *
-    * @see AssetMaintenancesController::postCreate() method that stores the data
-    * @author  Vincent Sposato <vincent.sposato@gmail.com>
-    * @version v1.0
-    * @since [v1.8]
-    * @return mixed
-    */
-    public function getCreate($assetId = null)
+     *  Returns a form view to create a new asset maintenance.
+     *
+     * @see AssetMaintenancesController::postCreate() method that stores the data
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @version v1.0
+     * @since [v1.8]
+     * @return mixed
+     */
+    public function create()
    {
        // Prepare Asset Maintenance Type List
        $assetMaintenanceType = [
                                    '' => 'Select an asset maintenance type',
                                ] + AssetMaintenance::getImprovementOptions();
        // Mark the selected asset, if it came in
-        $selectedAsset = $assetId;
-
-        $assets = Helper::detailedAssetList();
-
-        $supplier_list = Helper::suppliersList();
-
        // Render the view
-        return View::make('asset_maintenances/edit')
-                   ->with('asset_list', $assets)
-                   ->with('selectedAsset', $selectedAsset)
-                   ->with('supplier_list', $supplier_list)
+        return view('asset_maintenances/edit')
+                   ->with('asset_list', Helper::detailedAssetList())
+                   ->with('selectedAsset', request('asset_id'))
+                   ->with('supplier_list', Helper::suppliersList())
                   ->with('assetMaintenanceType', $assetMaintenanceType)
                   ->with('item', new AssetMaintenance);
    }
@@ -194,62 +177,29 @@ class AssetMaintenancesController extends Controller
    * @since [v1.8]
    * @return mixed
    */
-    public function postCreate()
+    public function store(Request $request)
    {
-
-        // get the POST data
-        $new = Input::all();
-
        // create a new model instance
        $assetMaintenance = new AssetMaintenance();
-
-
-        if (e(Input::get('supplier_id')) == '') {
-            $assetMaintenance->supplier_id = null;
-        } else {
-            $assetMaintenance->supplier_id = e(Input::get('supplier_id'));
-        }
-
-        if (e(Input::get('is_warranty')) == '') {
-            $assetMaintenance->is_warranty = 0;
-        } else {
-            $assetMaintenance->is_warranty = e(Input::get('is_warranty'));
-        }
-
-        if (e(Input::get('cost')) == '') {
-            $assetMaintenance->cost = '';
-        } else {
-            $assetMaintenance->cost =  Helper::ParseFloat(e(Input::get('cost')));
-        }
-
-        if (e(Input::get('notes')) == '') {
-            $assetMaintenance->notes = null;
-        } else {
-            $assetMaintenance->notes = e(Input::get('notes'));
-        }
-
-        $asset = Asset::find(e(Input::get('asset_id')));
+        $assetMaintenance->supplier_id = $request->input('supplier_id');
+        $assetMaintenance->is_warranty = $request->input('is_warranty');
+        $assetMaintenance->cost =  e($request->input('cost'));
+        $assetMaintenance->notes = e($request->input('notes'));
+        $asset = Asset::find(e($request->input('asset_id')));

        if (!Company::isCurrentUserHasAccess($asset)) {
            return static::getInsufficientPermissionsRedirect();
        }

        // Save the asset maintenance data
-        $assetMaintenance->asset_id               = e(Input::get('asset_id'));
-        $assetMaintenance->asset_maintenance_type = e(Input::get('asset_maintenance_type'));
-        $assetMaintenance->title                  = e(Input::get('title'));
-        $assetMaintenance->start_date             = e(Input::get('start_date'));
-        $assetMaintenance->completion_date        = e(Input::get('completion_date'));
-        $assetMaintenance->user_id                = Auth::user()->id;
+        $assetMaintenance->asset_id               = $request->input('asset_id');
+        $assetMaintenance->asset_maintenance_type = $request->input('asset_maintenance_type');
+        $assetMaintenance->title                  = $request->input('title');
+        $assetMaintenance->start_date             = $request->input('start_date');
+        $assetMaintenance->completion_date        = $request->input('completion_date');
+        $assetMaintenance->user_id                = Auth::id();

-        if (( $assetMaintenance->completion_date == "" )
-            || ( $assetMaintenance->completion_date == "0000-00-00" )
-        ) {
-            $assetMaintenance->completion_date = null;
-        }
-
-        if (( $assetMaintenance->completion_date !== "" )
-            && ( $assetMaintenance->completion_date !== "0000-00-00" )
+        if (( $assetMaintenance->completion_date !== null )
            && ( $assetMaintenance->start_date !== "" )
            && ( $assetMaintenance->start_date !== "0000-00-00" )
        ) {
@@ -260,17 +210,13 @@ class AssetMaintenancesController extends Controller

        // Was the asset maintenance created?
        if ($assetMaintenance->save()) {
-
            // Redirect to the new asset maintenance page
-            return redirect()->to("admin/asset_maintenances")
+            return redirect()->route('maintenances.index')
                           ->with('success', trans('admin/asset_maintenances/message.create.success'));
        }

        return redirect()->back()->withInput()->withErrors($assetMaintenance->getErrors());

-
-
-
    }

    /**
@@ -283,12 +229,12 @@ class AssetMaintenancesController extends Controller
    * @since [v1.8]
    * @return mixed
    */
-    public function getEdit($assetMaintenanceId = null)
+    public function edit($assetMaintenanceId = null)
    {
        // Check if the asset maintenance exists
        if (is_null($assetMaintenance = AssetMaintenance::find($assetMaintenanceId))) {
            // Redirect to the improvement management page
-            return redirect()->to('admin/asset_maintenances')
+            return redirect()->route('maintenances.index')
                           ->with('error', trans('admin/asset_maintenances/message.not_found'));
        } elseif (!Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
            return static::getInsufficientPermissionsRedirect();
@@ -311,88 +257,59 @@ class AssetMaintenancesController extends Controller
                                    '' => 'Select an improvement type',
                                ] + AssetMaintenance::getImprovementOptions();

-        $assets = Company::scopeCompanyables(Asset::with('model','assignedUser')->get(), 'assets.company_id')->lists('detailed_name', 'id');
        // Get Supplier List
-        $supplier_list = Helper::suppliersList();
-
        // Render the view
-        return View::make('asset_maintenances/edit')
-                   ->with('asset_list', $assets)
+        return view('asset_maintenances/edit')
+                   ->with('asset_list', Helper::detailedAssetList())
                   ->with('selectedAsset', null)
-                   ->with('supplier_list', $supplier_list)
+                   ->with('supplier_list', Helper::suppliersList())
                   ->with('assetMaintenanceType', $assetMaintenanceType)
                   ->with('item', $assetMaintenance);

    }

    /**
-    *  Validates and stores an update to an asset maintenance
-    *
-    * @see AssetMaintenancesController::postEdit() method that stores the data
-    * @author  Vincent Sposato <vincent.sposato@gmail.com>
-    * @param int $assetMaintenanceId
-    * @version v1.0
-    * @since [v1.8]
-    * @return mixed
-    */
-    public function postEdit($assetMaintenanceId = null)
+     *  Validates and stores an update to an asset maintenance
+     *
+     * @see AssetMaintenancesController::postEdit() method that stores the data
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @param Request $request
+     * @param int $assetMaintenanceId
+     * @return mixed
+     * @version v1.0
+     * @since [v1.8]
+     */
+    public function update(Request $request, $assetMaintenanceId = null)
    {
-
-        // get the POST data
-        $new = Input::all();
-
        // Check if the asset maintenance exists
        if (is_null($assetMaintenance = AssetMaintenance::find($assetMaintenanceId))) {
            // Redirect to the asset maintenance management page
-            return redirect()->to('admin/asset_maintenances')
+            return redirect()->route('maintenances.index')
                           ->with('error', trans('admin/asset_maintenances/message.not_found'));
        } elseif (!Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
            return static::getInsufficientPermissionsRedirect();
        }

+        $assetMaintenance->supplier_id = e($request->input('supplier_id'));
+        $assetMaintenance->is_warranty = e($request->input('is_warranty'));
+        $assetMaintenance->cost =  Helper::ParseFloat(e($request->input('cost')));
+        $assetMaintenance->notes = e($request->input('notes'));

-
-        if (e(Input::get('supplier_id')) == '') {
-            $assetMaintenance->supplier_id = null;
-        } else {
-            $assetMaintenance->supplier_id = e(Input::get('supplier_id'));
-        }
-
-        if (e(Input::get('is_warranty')) == '') {
-            $assetMaintenance->is_warranty = 0;
-        } else {
-            $assetMaintenance->is_warranty = e(Input::get('is_warranty'));
-        }
-
-        if (e(Input::get('cost')) == '') {
-            $assetMaintenance->cost = '';
-        } else {
-            $assetMaintenance->cost =  Helper::ParseFloat(e(Input::get('cost')));
-        }
-
-        if (e(Input::get('notes')) == '') {
-            $assetMaintenance->notes = null;
-        } else {
-            $assetMaintenance->notes = e(Input::get('notes'));
-        }
-
-        $asset = Asset::find(e(Input::get('asset_id')));
+        $asset = Asset::find(request('asset_id'));

        if (!Company::isCurrentUserHasAccess($asset)) {
            return static::getInsufficientPermissionsRedirect();
        }

        // Save the asset maintenance data
-        $assetMaintenance->asset_id               = e(Input::get('asset_id'));
-        $assetMaintenance->asset_maintenance_type = e(Input::get('asset_maintenance_type'));
-        $assetMaintenance->title                  = e(Input::get('title'));
-        $assetMaintenance->start_date             = e(Input::get('start_date'));
-        $assetMaintenance->completion_date        = e(Input::get('completion_date'));
+        $assetMaintenance->asset_id               = $request->input('asset_id');
+        $assetMaintenance->asset_maintenance_type = $request->input('asset_maintenance_type');
+        $assetMaintenance->title                  = $request->input('title');
+        $assetMaintenance->start_date             = $request->input('start_date');
+        $assetMaintenance->completion_date        = $request->input('completion_date');

-        if (( $assetMaintenance->completion_date == "" )
-          || ( $assetMaintenance->completion_date == "0000-00-00" )
+        if (( $assetMaintenance->completion_date == null )
        ) {
-            $assetMaintenance->completion_date = null;
            if (( $assetMaintenance->asset_maintenance_time !== 0 )
              || ( !is_null($assetMaintenance->asset_maintenance_time) )
            ) {
@@ -400,8 +317,7 @@ class AssetMaintenancesController extends Controller
            }
        }

-        if (( $assetMaintenance->completion_date !== "" )
-          && ( $assetMaintenance->completion_date !== "0000-00-00" )
+        if (( $assetMaintenance->completion_date !== null )
          && ( $assetMaintenance->start_date !== "" )
          && ( $assetMaintenance->start_date !== "0000-00-00" )
        ) {
@@ -414,12 +330,10 @@ class AssetMaintenancesController extends Controller
        if ($assetMaintenance->save()) {

            // Redirect to the new asset maintenance page
-            return redirect()->to("admin/asset_maintenances")
-                         ->with('success', trans('admin/asset_maintenances/message.create.success'));
+            return redirect()->route('maintenances.index')
+                         ->with('success', trans('admin/asset_maintenances/message.edit.success'));
        }
-        return redirect()->back() ->withInput()->withErrors($assetMaintenance->getErrors());
-
-
+        return redirect()->back()->withInput()->withErrors($assetMaintenance->getErrors());
    }

    /**
@@ -431,12 +345,12 @@ class AssetMaintenancesController extends Controller
    * @since [v1.8]
    * @return mixed
    */
-    public function getDelete($assetMaintenanceId)
+    public function destroy($assetMaintenanceId)
    {
        // Check if the asset maintenance exists
        if (is_null($assetMaintenance = AssetMaintenance::find($assetMaintenanceId))) {
            // Redirect to the asset maintenance management page
-            return redirect()->to('admin/asset_maintenances')
+            return redirect()->route('maintenances.index')
                           ->with('error', trans('admin/asset_maintenances/message.not_found'));
        } elseif (!Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
            return static::getInsufficientPermissionsRedirect();
@@ -446,7 +360,7 @@ class AssetMaintenancesController extends Controller
        $assetMaintenance->delete();

        // Redirect to the asset_maintenance management page
-        return redirect()->to('admin/asset_maintenances')
+        return redirect()->route('maintenances.index')
                       ->with('success', trans('admin/asset_maintenances/message.delete.success'));
    }

@@ -459,17 +373,17 @@ class AssetMaintenancesController extends Controller
    * @since [v1.8]
    * @return View
    */
-    public function getView($assetMaintenanceId)
+    public function show($assetMaintenanceId)
    {
        // Check if the asset maintenance exists
        if (is_null($assetMaintenance = AssetMaintenance::find($assetMaintenanceId))) {
            // Redirect to the asset maintenance management page
-            return redirect()->to('admin/asset_maintenances')
+            return redirect()->route('maintenances.index')
                           ->with('error', trans('admin/asset_maintenances/message.not_found'));
        } elseif (!Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
            return static::getInsufficientPermissionsRedirect();
        }

-        return View::make('asset_maintenances/view')->with('assetMaintenance', $assetMaintenance);
+        return view('asset_maintenances/view')->with('assetMaintenance', $assetMaintenance);
    }
 }
--- a/app/Http/Controllers/AssetModelsController.php
+++ b/app/Http/Controllers/AssetModelsController.php
@@ -1,6 +1,7 @@
 <?php
 namespace App\Http\Controllers;

+use App\Models\CustomField;
 use Image;
 use Input;
 use Lang;
@@ -15,6 +16,7 @@ use App\Models\Asset;
 use App\Models\Company;
 use Config;
 use App\Helpers\Helper;
+use Illuminate\Http\Request;

 use Symfony\Component\HttpFoundation\JsonResponse;

@@ -36,10 +38,9 @@ class AssetModelsController extends Controller
    * @since [v1.0]
    * @return View
    */
-    public function getIndex()
+    public function index()
    {
-        // Show the page
-        return View::make('models/index');
+        return view('models/index');
    }

    /**
@@ -49,16 +50,13 @@ class AssetModelsController extends Controller
    * @since [v1.0]
    * @return View
    */
-    public function getCreate()
+    public function create()
    {
        // Show the page
-        $depreciation_list = Helper::depreciationList();
-        $manufacturer_list = Helper::manufacturerList();
-        $category_list = Helper::categoryList('asset');
-        return View::make('models/edit')
-        ->with('category_list', $category_list)
-        ->with('depreciation_list', $depreciation_list)
-        ->with('manufacturer_list', $manufacturer_list)
+        return view('models/edit')
+        ->with('category_list', Helper::categoryList('asset'))
+        ->with('depreciation_list', Helper::depreciationList())
+        ->with('manufacturer_list', Helper::manufacturerList())
        ->with('item', new AssetModel);
    }

@@ -70,39 +68,27 @@ class AssetModelsController extends Controller
    * @since [v1.0]
    * @return Redirect
    */
-    public function postCreate()
+    public function store(Request $request)
    {

        // Create a new asset model
        $model = new AssetModel;

-
-        if (e(Input::get('depreciation_id')) == '') {
-            $model->depreciation_id =  0;
-        } else {
-            $model->depreciation_id = e(Input::get('depreciation_id'));
-        }
-
-        if (e(Input::get('eol')) == '') {
-            $model->eol =  0;
-        } else {
-            $model->eol = e(Input::get('eol'));
-        }
-
        // Save the model data
-        $model->name                = e(Input::get('name'));
-        $model->model_number             = e(Input::get('model_number'));
-        $model->manufacturer_id     = e(Input::get('manufacturer_id'));
-        $model->category_id         = e(Input::get('category_id'));
-        $model->notes               = e(Input::get('notes'));
-        $model->user_id             = Auth::user()->id;
+        $model->eol = $request->input('eol');
+        $model->depreciation_id = $request->input('depreciation_id');
+        $model->name                = $request->input('name');
+        $model->model_number        = $request->input('model_number');
+        $model->manufacturer_id     = $request->input('manufacturer_id');
+        $model->category_id         = $request->input('category_id');
+        $model->notes               = $request->input('notes');
+        $model->user_id             = Auth::guard('api')->user();
        $model->requestable         = Input::has('requestable');

-        if (Input::get('custom_fieldset')!='') {
-            $model->fieldset_id = e(Input::get('custom_fieldset'));
+        if ($request->input('custom_fieldset')!='') {
+            $model->fieldset_id = e($request->input('custom_fieldset'));
        }

-
        if (Input::file('image')) {
            $image = Input::file('image');
            $file_name = str_random(25).".".$image->getClientOriginalExtension();
@@ -117,22 +103,21 @@ class AssetModelsController extends Controller
            // Was it created?
        if ($model->save()) {
            // Redirect to the new model  page
-            return redirect()->to("hardware/models")->with('success', trans('admin/models/message.create.success'));
+            return redirect()->route("models.index")->with('success', trans('admin/models/message.create.success'));
        }
-
-            return redirect()->back()->withInput()->withErrors($model->getErrors());
-
+        return redirect()->back()->withInput()->withErrors($model->getErrors());
    }

    /**
-    * Validates and stores new Asset Model data created from the
-    * modal form on the Asset Creation view.
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @since [v2.0]
-    * @return String JSON
-    */
-    public function store()
+     * Validates and stores new Asset Model data created from the
+     * modal form on the Asset Creation view.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v2.0]
+     * @param Request $request
+     * @return String JSON
+     */
+    public function apiStore(Request $request)
    {
      //COPYPASTA!!!! FIXME
        $model = new AssetModel;
@@ -140,18 +125,18 @@ class AssetModelsController extends Controller
        $settings=Input::all();
        $settings['eol']= null;

-        $model->name=e(Input::get('name'));
-        $model->manufacturer_id = e(Input::get('manufacturer_id'));
-        $model->category_id = e(Input::get('category_id'));
-        $model->model_number = e(Input::get('model_number'));
-        $model->user_id = Auth::user()->id;
-        $model->notes            = e(Input::get('notes'));
+        $model->name=$request->input('name');
+        $model->manufacturer_id = $request->input('manufacturer_id');
+        $model->category_id = $request->input('category_id');
+        $model->model_number = $request->input('model_number');
+        $model->user_id = Auth::id();
+        $model->notes            = $request->input('notes');
        $model->eol= null;

-        if (Input::get('fieldset_id')=='') {
+        if ($request->input('fieldset_id')=='') {
            $model->fieldset_id = null;
        } else {
-            $model->fieldset_id = e(Input::get('fieldset_id'));
+            $model->fieldset_id = e($request->input('fieldset_id'));
        }

        if ($model->save()) {
@@ -170,22 +155,18 @@ class AssetModelsController extends Controller
    * @param int $modelId
    * @return View
    */
-    public function getEdit($modelId = null)
+    public function edit($modelId = null)
    {
        // Check if the model exists
        if (is_null($item = AssetModel::find($modelId))) {
            // Redirect to the model management page
-            return redirect()->to('assets/models')->with('error', trans('admin/models/message.does_not_exist'));
+            return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));
        }

-        $depreciation_list = Helper::depreciationList();
-        $manufacturer_list = Helper::manufacturerList();
-        $category_list = Helper::categoryList('asset');
-
        $view = View::make('models/edit', compact('item'));
-        $view->with('category_list', $category_list);
-        $view->with('depreciation_list', $depreciation_list);
-        $view->with('manufacturer_list', $manufacturer_list);
+        $view->with('category_list', Helper::categoryList('asset'));
+        $view->with('depreciation_list', Helper::depreciationList());
+        $view->with('manufacturer_list', Helper::manufacturerList());
        return $view;
    }

@@ -199,39 +180,28 @@ class AssetModelsController extends Controller
    * @param int $modelId
    * @return Redirect
    */
-    public function postEdit($modelId = null)
+    public function update(Request $request, $modelId = null)
    {
        // Check if the model exists
        if (is_null($model = AssetModel::find($modelId))) {
            // Redirect to the models management page
-            return redirect()->to('admin/models')->with('error', trans('admin/models/message.does_not_exist'));
+            return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));
        }

-
-        if (e(Input::get('depreciation_id')) == '') {
-            $model->depreciation_id =  0;
-        } else {
-            $model->depreciation_id = e(Input::get('depreciation_id'));
-        }
-
-        if (e(Input::get('eol')) == '') {
-            $model->eol =  null;
-        } else {
-            $model->eol = e(Input::get('eol'));
-        }
-        // Update the model data
-        $model->name                = e(Input::get('name'));
-        $model->model_number        = e(Input::get('model_number'));
-        $model->manufacturer_id     = e(Input::get('manufacturer_id'));
-        $model->category_id         = e(Input::get('category_id'));
-        $model->notes               = e(Input::get('notes'));
+        $model->depreciation_id = $request->input('depreciation_id');
+        $model->eol = $request->input('eol');
+        $model->name                = $request->input('name');
+        $model->model_number        = $request->input('model_number');
+        $model->manufacturer_id     = $request->input('manufacturer_id');
+        $model->category_id         = $request->input('category_id');
+        $model->notes               = $request->input('notes');

        $model->requestable = Input::has('requestable');

-        if (Input::get('custom_fieldset')=='') {
+        if ($request->input('custom_fieldset')=='') {
            $model->fieldset_id = null;
        } else {
-            $model->fieldset_id = e(Input::get('custom_fieldset'));
+            $model->fieldset_id = $request->input('custom_fieldset');
        }

        if (Input::file('image')) {
@@ -245,22 +215,14 @@ class AssetModelsController extends Controller
            $model->image = $file_name;
        }

-        if (Input::get('image_delete') == 1 && Input::file('image') == "") {
+        if ($request->input('image_delete') == 1 && Input::file('image') == "") {
            $model->image = null;
        }

-        // Was it created?
        if ($model->save()) {
-            // Redirect to the new model  page
-            return redirect()->to("hardware/models")->with('success', trans('admin/models/message.update.success'));
-        } else {
-            return redirect()->back()->withInput()->withErrors($model->getErrors());
+            return redirect()->route("models.index")->with('success', trans('admin/models/message.update.success'));
        }
-
-
-        // Redirect to the model create page
-        return redirect()->to("hardware/models/$modelId/edit")->with('error', trans('admin/models/message.update.error'));
-
+        return redirect()->back()->withInput()->withErrors($model->getErrors());
    }

    /**
@@ -272,25 +234,22 @@ class AssetModelsController extends Controller
    * @param int $modelId
    * @return Redirect
    */
-    public function getDelete($modelId)
+    public function destroy($modelId)
    {
        // Check if the model exists
        if (is_null($model = AssetModel::find($modelId))) {
-            // Redirect to the blogs management page
-            return redirect()->to('hardware/models')->with('error', trans('admin/models/message.not_found'));
+            return redirect()->route('models.index')->with('error', trans('admin/models/message.not_found'));
        }

-        if ($model->assets->count() > 0) {
+        if ($model->assets()->count() > 0) {
            // Throw an error that this model is associated with assets
-            return redirect()->to('hardware/models')->with('error', trans('admin/models/message.assoc_users'));
-
-        } else {
-            // Delete the model
-            $model->delete();
-
-            // Redirect to the models management page
-            return redirect()->to('hardware/models')->with('success', trans('admin/models/message.delete.success'));
+            return redirect()->route('models.index')->with('error', trans('admin/models/message.assoc_users'));
        }
+        // Delete the model
+        $model->delete();
+
+        // Redirect to the models management page
+        return redirect()->route('models.index')->with('success', trans('admin/models/message.delete.success'));
    }


@@ -317,11 +276,10 @@ class AssetModelsController extends Controller
            $success = trans('admin/models/message.restore.success');

            // Redirect back
-            return redirect()->back()->with('success', $success);
+            return redirect()->route('models.index')->with('success', $success);

-        } else {
-            return redirect()->back()->with('error', trans('admin/models/message.not_found'));
        }
+        return redirect()->back()->with('error', trans('admin/models/message.not_found'));

    }

@@ -334,21 +292,18 @@ class AssetModelsController extends Controller
    * @param int $modelId
    * @return View
    */
-    public function getView($modelId = null)
+    public function show($modelId = null)
    {
        $model = AssetModel::withTrashed()->find($modelId);

        if (isset($model->id)) {
-                return View::make('models/view', compact('model'));
-        } else {
-            // Prepare the error message
-            $error = trans('admin/models/message.does_not_exist', compact('id'));
-
-            // Redirect to the user management page
-            return redirect()->route('models')->with('error', $error);
+            return view('models/view', compact('model'));
        }
+        // Prepare the error message
+        $error = trans('admin/models/message.does_not_exist', compact('id'));

-
+        // Redirect to the user management page
+        return redirect()->route('models.index')->with('error', $error);
    }

    /**
@@ -363,21 +318,17 @@ class AssetModelsController extends Controller
    {
        // Check if the model exists
        if (is_null($model_to_clone = AssetModel::find($modelId))) {
-            // Redirect to the model management page
-            return redirect()->to('assets/models')->with('error', trans('admin/models/message.does_not_exist'));
+            return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));
        }

        $model = clone $model_to_clone;
        $model->id = null;

        // Show the page
-        $depreciation_list = Helper::depreciationList();
-        $manufacturer_list = Helper::manufacturerList();
-        $category_list = Helper::categoryList('asset');
        $view = View::make('models/edit');
-        $view->with('category_list', $category_list);
-        $view->with('depreciation_list', $depreciation_list);
-        $view->with('manufacturer_list', $manufacturer_list);
+        $view->with('category_list', Helper::categoryList('asset'));
+        $view->with('depreciation_list', Helper::depreciationList());
+        $view->with('manufacturer_list', Helper::manufacturerList());
        $view->with('item', $model);
        $view->with('clone_model', $model_to_clone);
        return $view;
@@ -396,121 +347,35 @@ class AssetModelsController extends Controller
    public function getCustomFields($modelId)
    {
        $model = AssetModel::find($modelId);
-        return View::make("models.custom_fields_form")->with("model", $model);
+        return view("models.custom_fields_form")->with("model", $model);
    }



    /**
-    * Get the JSON response to populate the data tables on the
-    * Asset Model listing page.
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @since [v2.0]
-    * @param string $status
-    * @return String JSON
-    */
-
-    public function getDatatable($status = null)
-    {
-        $models = AssetModel::with('category', 'assets', 'depreciation', 'manufacturer');
-
-        switch ($status) {
-            case 'Deleted':
-                $models->withTrashed()->Deleted();
-                break;
-        }
-
-
-        if (Input::has('search')) {
-            $models = $models->TextSearch(Input::get('search'));
-        }
-
-        if (Input::has('offset')) {
-            $offset = e(Input::get('offset'));
-        } else {
-            $offset = 0;
-        }
-
-        if (Input::has('limit')) {
-            $limit = e(Input::get('limit'));
-        } else {
-            $limit = 50;
-        }
-
-
-        $allowed_columns = ['id','name','model_number'];
-        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array(Input::get('sort'), $allowed_columns) ? e(Input::get('sort')) : 'created_at';
-
-        $models = $models->orderBy($sort, $order);
-
-        $modelCount = $models->count();
-        $models = $models->skip($offset)->take($limit)->get();
-
-        $rows = array();
-
-        foreach ($models as $model) {
-            if ($model->deleted_at == '') {
-                $actions = '<div style=" white-space: nowrap;"><a href="'.route('clone/model', $model->id).'" class="btn btn-info btn-sm" title="Clone Model" data-toggle="tooltip"><i class="fa fa-clone"></i></a> <a href="'.route('update/model', $model->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/model', $model->id).'" data-content="'.trans('admin/models/message.delete.confirm').'" data-title="'.trans('general.delete').' '.htmlspecialchars($model->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></div>';
-            } else {
-                $actions = '<a href="'.route('restore/model', $model->id).'" class="btn btn-warning btn-sm"><i class="fa fa-recycle icon-white"></i></a>';
-            }
-
-            $rows[] = array(
-                'id'      => $model->id,
-                'manufacturer'      => (string)link_to('/admin/settings/manufacturers/'.$model->manufacturer->id.'/view', $model->manufacturer->name),
-                'name'              => (string)link_to('/hardware/models/'.$model->id.'/view', $model->name),
-                'image' => ($model->image!='') ? '<img src="'.config('app.url').'/uploads/models/'.$model->image.'" height=50 width=50>' : '',
-                'modelnumber'       => $model->model_number,
-                'numassets'         => $model->assets->count(),
-                'depreciation'      => (($model->depreciation) && ($model->depreciation->id > 0)) ? $model->depreciation->name.' ('.$model->depreciation->months.')' : trans('general.no_depreciation'),
-                'category'          => ($model->category) ? (string)link_to('admin/settings/categories/'.$model->category->id.'/view', $model->category->name) : '',
-                'eol'               => ($model->eol) ? $model->eol.' '.trans('general.months') : '',
-                'note'              => $model->getNote(),
-                'fieldset'          => ($model->fieldset) ? (string)link_to('admin/custom_fields/'.$model->fieldset->id, $model->fieldset->name) : '',
-                'actions'           => $actions
-                );
-        }
-
-        $data = array('total' => $modelCount, 'rows' => $rows);
-
-        return $data;
-    }
-
-
-    /**
-    * Get the asset information to present to the model view detail page
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @since [v2.0]
-    * @param int $modelId
-    * @return String JSON
-    */
-    public function getDataView($modelID)
+     * 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(Input::get('search')));
-        }
-
-        if (Input::has('offset')) {
-            $offset = e(Input::get('offset'));
-        } else {
-            $offset = 0;
-        }
-
-        if (Input::has('limit')) {
-            $limit = e(Input::get('limit'));
-        } else {
-            $limit = 50;
+            $assets = $assets->TextSearch(e($request->input('search')));
        }
+        $offset = request('offset', 0);
+        $limit = request('limit', 50);


        $allowed_columns = ['name', 'serial','asset_tag'];
-        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array(Input::get('sort'), $allowed_columns) ? e(Input::get('sort')) : 'created_at';
+        $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);

@@ -519,33 +384,83 @@ class AssetModelsController extends Controller

        $rows = array();

-
+        $all_custom_fields = CustomField::all();
        foreach ($assets as $asset) {
-            $actions = '';

-            if ($asset->assetstatus) {
-                if ($asset->assetstatus->deployable != 0) {
-                    if (($asset->assigned_to !='') && ($asset->assigned_to > 0)) {
-                        $actions = '<a href="'.route('checkin/hardware', $asset->id).'" class="btn btn-primary btn-sm">'.trans('general.checkin').'</a>';
-                    } else {
-                        $actions = '<a href="'.route('checkout/hardware', $asset->id).'" class="btn btn-info btn-sm">'.trans('general.checkout').'</a>';
-                    }
-                }
-            }
-
-            $rows[] = array(
-                'id'            => $asset->id,
-                'name'          => (string)link_to('/hardware/'.$asset->id.'/view', $asset->showAssetName()),
-                'asset_tag'     => (string)link_to('hardware/'.$asset->id.'/view', $asset->asset_tag),
-                'serial'        => $asset->serial,
-                'assigned_to'   => ($asset->assigned_to) ? (string)link_to('/admin/users/'.$asset->assigned_to.'/view', $asset->assigneduser->fullName()) : '',
-                'actions'       => $actions,
-                'companyName'   => Company::getName($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
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.7]
+     * @return \Illuminate\Contracts\View\View
+     */
+    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();
+
+        
+             return view('models/bulk-edit', compact('models'))
+                ->with('manufacturer_list', $manufacturer_list)
+                ->with('category_list', $category_list)
+                ->with('fieldset_list', $fieldset_list)
+                ->with('depreciation_list', $depreciation_list);
+
+    }
+
+
+
+    /**
+     * Returns a view that allows the user to bulk edit model attrbutes
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.7]
+     * @return \Illuminate\Contracts\View\View
+     */
+    public function postBulkEditSave(Request $request)
+    {
+
+        $models_raw_array = Input::get('ids');
+        $update_array = array();
+
+        if (($request->has('manufacturer_id') && ($request->input('manufacturer_id')!='NC'))) {
+            $update_array['manufacturer_id'] = $request->input('manufacturer_id');
+        }
+        if (($request->has('category_id') && ($request->input('category_id')!='NC'))) {
+            $update_array['category_id'] = $request->input('category_id');
+        }
+        if ($request->input('fieldset_id')!='NC') {
+            $update_array['fieldset_id'] = $request->input('fieldset_id');
+        }
+        if ($request->input('depreciation_id')!='NC') {
+            $update_array['depreciation_id'] = $request->input('depreciation_id');
+        }
+
+
+        
+        if (count($update_array) > 0) {
+            AssetModel::whereIn('id', $models_raw_array)->update($update_array);
+            return redirect()->route('models.index')
+                ->with('success', trans('admin/models/message.bulkedit.success'));
+        }
+
+        return redirect()->route('models.index')
+            ->with('warning', trans('admin/models/message.bulkedit.error'));
+
+    }
+
 }
--- a/app/Http/Controllers/AssetsController.php
+++ b/app/Http/Controllers/AssetsController.php
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
+use Illuminate\Http\Request;
+
+class ForgotPasswordController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reset Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling password reset emails and
+    | includes a trait which assists in sending these notifications from
+    | your application to your users. Feel free to explore this trait.
+    |
+    */
+
+    use SendsPasswordResetEmails;
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('guest');
+    }
+
+    /**
+     * Get the e-mail subject line to be used for the reset link email.
+     * Overriding method "getEmailSubject()" from trait "use ResetsPasswords"
+     * @return string
+     */
+    public function getEmailSubject()
+    {
+        return property_exists($this, 'subject') ? $this->subject : \Lang::get('mail.reset_link');
+    }
+
+    /**
+     * Send a reset link to the given user.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function sendResetLinkEmail(Request $request)
+    {
+        $this->validate($request, ['email' => 'required|email']);
+
+        // We will send the password reset link to this user. Once we have attempted
+        // to send the link, we will examine the response then see the message we
+        // need to show to the user. Finally, we'll send out a proper response.
+        $response = $this->broker()->sendResetLink(
+            $request->only('email')
+        );
+
+        if ($response === \Password::RESET_LINK_SENT) {
+            return redirect()->route('login')->with('status', trans($response));
+        }
+
+        // If an error was returned by the password broker, we will get this message
+        // translated so we can notify a user of the problem. We'll redirect back
+        // to where the users came from so they can attempt this process again.
+        return back()->withErrors(
+            ['email' => trans($response)]
+        );
+    }
+}
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -5,7 +5,6 @@ namespace App\Http\Controllers\Auth;
 use Validator;
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\ThrottlesLogins;
-use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
 use App\Models\Setting;
 use App\Models\Ldap;
 use App\Models\User;
@@ -18,20 +17,17 @@ use Log;
 use View;
 use PragmaRX\Google2FA\Google2FA;

-
-
 /**
 * This controller handles authentication for the user, including local
 * database users and LDAP users.
 *
- * @todo Move LDAP methods into user model for better separation of concerns.
 * @author [A. Gianotto] [<snipe@snipe.net>]
 * @version    v1.0
 */
-class AuthController extends Controller
+class LoginController extends Controller
 {

-    use AuthenticatesAndRegistersUsers, ThrottlesLogins;
+    use ThrottlesLogins;

    // This tells the auth controller to use username instead of email address
    protected $username = 'username';
@@ -59,7 +55,7 @@ class AuthController extends Controller
        if (Auth::check()) {
            return redirect()->intended('dashboard');
        }
-        return View::make('auth.login');
+        return view('auth.login');
    }


@@ -67,7 +63,7 @@ class AuthController extends Controller
    {
        LOG::debug("Binding user to LDAP.");
        $ldap_user = Ldap::findAndBindUserLdap($request->input('username'), $request->input('password'));
-        if(!$ldap_user) {
+        if (!$ldap_user) {
            LOG::debug("LDAP user ".$request->input('username')." not found in LDAP or could not bind");
            throw new \Exception("Could not find user in LDAP directory");
        } else {
@@ -75,7 +71,7 @@ class AuthController extends Controller
        }

        // Check if the user already exists in the database and was imported via LDAP
-        $user = User::where('username', '=', Input::get('username'))->whereNull('deleted_at')->where('ldap_import','=',1)->first();
+        $user = User::where('username', '=', Input::get('username'))->whereNull('deleted_at')->where('ldap_import', '=', 1)->first();
        LOG::debug("Local auth lookup complete");

        // The user does not exist in the database. Try to get them from LDAP.
@@ -123,16 +119,11 @@ class AuthController extends Controller
            return redirect()->back()->withInput()->withErrors($validator);
        }

-        // If the class is using the ThrottlesLogins trait, we can automatically throttle
-        // the login attempts for this application. We'll key this by the username and
-        // the IP address of the client making these requests into this application.
-        $throttles = $this->isUsingThrottlesLoginsTrait();
        $this->maxLoginAttempts = config('auth.throttle.max_attempts');
        $this->lockoutTime = config('auth.throttle.lockout_duration');

-        if ($throttles && $lockedOut = $this->hasTooManyLoginAttempts($request)) {
+        if ($lockedOut = $this->hasTooManyLoginAttempts($request)) {
            $this->fireLockoutEvent($request);
-
            return $this->sendLockoutResponse($request);
        }

@@ -142,8 +133,8 @@ class AuthController extends Controller
        if (Setting::getSettings()->ldap_enabled=='1') {
            LOG::debug("LDAP is enabled.");
            try {
-              $user = $this->login_via_ldap($request);
-              Auth::login($user, true);
+                $user = $this->login_via_ldap($request);
+                Auth::login($user, true);

            // If the user was unable to login via LDAP, log the error and let them fall through to
            // local authentication.
@@ -153,32 +144,30 @@ class AuthController extends Controller
        }

        // If the user wasn't authenticated via LDAP, skip to local auth
-        if(!$user) {
-          LOG::debug("Authenticating user against database.");
+        if (!$user) {
+            LOG::debug("Authenticating user against database.");
          // Try to log the user in
-          if (!Auth::attempt(Input::only('username', 'password'), Input::get('remember-me', 0))) {
+            if (!Auth::attempt(Input::only('username', 'password'), Input::get('remember-me', 0))) {

-              if ($throttles && ! $lockedOut) {
-                  $this->incrementLoginAttempts($request);
-              }
+                if (!$lockedOut) {
+                    $this->incrementLoginAttempts($request);
+                }
+
+                LOG::debug("Local authentication failed.");
+                return redirect()->back()->withInput()->with('error', trans('auth/message.account_not_found'));
+            } else {

-              LOG::debug("Local authentication failed.");
-              return redirect()->back()->withInput()->with('error', trans('auth/message.account_not_found'));
-          } else {
-              if ($throttles) {
                  $this->clearLoginAttempts($request);
-              }
-          }
+            }
        }

-        // Get the page we were before
-        $redirect = \Session::get('loginRedirect', 'home');
-
-        // Unset the page we were before from the session
-        \Session::forget('loginRedirect');
-
+        if ($user = Auth::user()) {
+            $user->last_login = \Carbon::now();
+            \Log::debug('Last login:'.$user->last_login);
+            $user->save();
+        }
        // Redirect to the users page
-        return redirect()->to($redirect)->with('success', trans('auth/message.signin.success'));
+        return redirect()->intended()->with('success', trans('auth/message.signin.success'));
    }


@@ -209,7 +198,7 @@ class AuthController extends Controller
            $user->two_factor_secret
        );

-        return View::make('auth.two_factor_enroll')->with('google2fa_url',$google2fa_url);
+        return view('auth.two_factor_enroll')->with('google2fa_url', $google2fa_url);

    }

@@ -219,8 +208,9 @@ class AuthController extends Controller
     *
     * @return Redirect
     */
-    public function getTwoFactorAuth() {
-        return View::make('auth.two_factor');
+    public function getTwoFactorAuth()
+    {
+        return view('auth.two_factor');
    }

    /**
@@ -228,7 +218,8 @@ class AuthController extends Controller
     *
     * @return Redirect
     */
-    public function postTwoFactorAuth(Request $request) {
+    public function postTwoFactorAuth(Request $request)
+    {

        if (!Auth::check()) {
            return redirect()->route('login')->with('error', 'You must be logged in.');
@@ -279,18 +270,54 @@ class AuthController extends Controller
        ]);
    }

-    /**
-     * Get the login lockout error message.
-     *
-     * @param  int  $seconds
-     * @return string
-     */
-    protected function getLockoutErrorMessage($seconds)
+
+    public function username()
    {
-        return \Lang::has('auth/message.throttle')
-            ? \Lang::get('auth/message.throttle', ['seconds' => $seconds])
-            : 'Too many login attempts. Please try again in '.$seconds.' seconds.';
+        return 'username';
+    }
+
+    /**
+    * Redirect the user after determining they are locked out.
+    *
+    * @param  \Illuminate\Http\Request  $request
+    * @return \Illuminate\Http\RedirectResponse
+    */
+    protected function sendLockoutResponse(Request $request)
+    {
+        $seconds = $this->limiter()->availableIn(
+            $this->throttleKey($request)
+        );
+
+        $minutes = round($seconds / 60);
+
+        $message = \Lang::get('auth/message.throttle', ['minutes' => $minutes]);
+
+            return redirect()->back()
+            ->withInput($request->only($this->username(), 'remember'))
+            ->withErrors([$this->username() => $message]);
    }


+    /**
+    * Override the lockout time and duration
+    *
+    * @param  \Illuminate\Http\Request  $request
+    * @return \Illuminate\Http\RedirectResponse
+    */
+    protected function hasTooManyLoginAttempts(Request $request)
+    {
+        $lockoutTime = config('auth.throttle.lockout_duration');
+        $maxLoginAttempts = config('auth.throttle.max_attempts');
+
+        return $this->limiter()->tooManyAttempts(
+            $this->throttleKey($request),
+            $maxLoginAttempts,
+            $lockoutTime
+        );
+    }
+
+    public function legacyAuthRedirect() {
+        return redirect()->route('login');
+    }
+
 }
--- a/app/Http/Controllers/Auth/PasswordController.php
+++ b/app/Http/Controllers/Auth/PasswordController.php
@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Foundation\Auth\ResetsPasswords;
-
-/**
- * This controller handles password resets for the user.
- * It uses the built-in Laravel magic of ResetsPasswords, so we
- * don't actually do much here.
- *
- * @author [A. Gianotto] [<snipe@snipe.net>]
- * @version    v1.0
- */
-class PasswordController extends Controller
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Password Reset Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller is responsible for handling password reset requests
-    | and uses a simple trait to include this behavior. You're free to
-    | explore this trait and override any methods you wish to tweak.
-    |
-    */
-
-    use ResetsPasswords;
-
-    /**
-     * Create a new password controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('guest');
-    }
-
-    /**
-     * Get the e-mail subject line to be used for the reset link email.
-     * Overriding method "getEmailSubject()" from trait "use ResetsPasswords"
-     * @return string
-     */
-    public function getEmailSubject(){
-        return property_exists($this, 'subject') ? $this->subject : \Lang::get('mail.reset_link');
-    }
-
-    /**
-     * Get the response for after the reset link has been successfully sent.
-     *
-     * @param  string  $response
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    protected function getSendResetLinkEmailSuccessResponse($response)
-    {
-        return redirect()->route('login')->with('status', trans($response));
-    }
-}
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\ResetsPasswords;
+
+class ResetPasswordController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reset Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling password reset requests
+    | and uses a simple trait to include this behavior. You're free to
+    | explore this trait and override any methods you wish to tweak.
+    |
+    */
+
+    use ResetsPasswords;
+
+    /**
+     * Where to redirect users after resetting their password.
+     *
+     * @var string
+     */
+    protected $redirectTo = '/home';
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('guest');
+    }
+}
--- a/app/Http/Controllers/CategoriesController.php
+++ b/app/Http/Controllers/CategoriesController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 use App\Helpers\Helper;
 use App\Models\Category as Category;
 use App\Models\Company;
+use App\Models\CustomField;
 use App\Models\Setting;
 use Auth;
 use DB;
@@ -32,12 +33,12 @@ class CategoriesController extends Controller
    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @see CategoriesController::getDatatable() method that generates the JSON response
    * @since [v1.0]
-    * @return View
-    */
-    public function getIndex()
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function index()
    {
        // Show the page
-        return View::make('categories/index');
+        return view('categories/index');
    }


@@ -45,16 +46,16 @@ class CategoriesController extends Controller
    * Returns a form view to create a new category.
    *
    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @see CategoriesController::postCreate() method that stores the data
+    * @see CategoriesController::store() method that stores the data
    * @since [v1.0]
-    * @return View
-    */
-    public function getCreate()
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function create()
    {
        // Show the page
         $category_types= Helper::categoryTypeList();
-        return View::make('categories/edit')->with('item', new Category)
-        ->with('category_types', $category_types);
+        return view('categories/edit')->with('item', new Category)
+            ->with('category_types', $category_types);
    }


@@ -62,39 +63,28 @@ class CategoriesController extends Controller
    * Validates and stores the new category data.
    *
    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @see CategoriesController::getCreate() method that makes the form.
+    * @see CategoriesController::create() method that makes the form.
    * @since [v1.0]
-    * @return Redirect
-    */
-    public function postCreate()
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function store(Request $request)
    {
-
        // create a new model instance
        $category = new Category();
-
        // Update the category data
-        $category->name                 = e(Input::get('name'));
-        $category->category_type        = e(Input::get('category_type'));
-        $category->eula_text            = e(Input::get('eula_text'));
-        $category->use_default_eula     = e(Input::get('use_default_eula', '0'));
-        $category->require_acceptance   = e(Input::get('require_acceptance', '0'));
-        $category->checkin_email        = e(Input::get('checkin_email', '0'));
-        $category->user_id              = Auth::user()->id;
+        $category->name                 = $request->input('name');
+        $category->category_type        = $request->input('category_type');
+        $category->eula_text            = $request->input('eula_text');
+        $category->use_default_eula     = $request->input('use_default_eula', '0');
+        $category->require_acceptance   = $request->input('require_acceptance', '0');
+        $category->checkin_email        = $request->input('checkin_email', '0');
+        $category->user_id              = Auth::id();

        if ($category->save()) {
-        // Redirect to the new category  page
-            return redirect()->to("admin/settings/categories")->with('success', trans('admin/categories/message.create.success'));
-        } else {
-
-          // The given data did not pass validation
-            return redirect()->back()->withInput()->withErrors($category->getErrors());
-
+            return redirect()->route('categories.index')->with('success', trans('admin/categories/message.create.success'));
        }

-        // Redirect to the category create page
-        return redirect()->to('admin/settings/categories/create')->with('error', trans('admin/categories/message.create.error'));
-
-
+        return redirect()->back()->withInput()->withErrors($category->getErrors());
    }

    /**
@@ -104,67 +94,56 @@ class CategoriesController extends Controller
    * @see CategoriesController::postEdit() method saves the data
    * @param int $categoryId
    * @since [v1.0]
-    * @return View
-    */
-    public function getEdit($categoryId = null)
+    * @return \Illuminate\Contracts\View\View
+     */
+    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'));
        }
-
-        // Show the page
-        //$category_options = array('' => 'Top Level') + Category::lists('name', 'id');
-
-        $category_options = array('' => 'Top Level') + DB::table('categories')->where('id', '!=', $categoryId)->lists('name', 'id');
        $category_types= Helper::categoryTypeList();

-        return View::make('categories/edit', compact('item'))
-        ->with('category_options', $category_options)
+        return view('categories/edit', compact('item'))
        ->with('category_types', $category_types);
    }


    /**
-    * Validates and stores the updated category data.
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @see CategoriesController::getEdit() method that makes the form.
-    * @param int $categoryId
-    * @since [v1.0]
-    * @return Redirect
-    */
-    public function postEdit(Request $request, $categoryId = null)
+     * Validates and stores the updated category data.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @see CategoriesController::getEdit() method that makes the form.
+     * @param Request $request
+     * @param int $categoryId
+     * @return \Illuminate\Http\RedirectResponse
+     * @since [v1.0]
+     */
+    public function update(Request $request, $categoryId = null)
    {
        // Check if the blog post exists
        if (is_null($category = Category::find($categoryId))) {
-            // Redirect to the blogs management page
+            // Redirect to the categories management page
            return redirect()->to('admin/categories')->with('error', trans('admin/categories/message.does_not_exist'));
        }

        // Update the category data
-        $category->name            = e($request->input('name'));
+        $category->name                 = $request->input('name');
        // If the item count is > 0, we disable the category type in the edit. Disabled items
        // don't POST, so if the category_type is blank we just set it to the default.
-        $category->category_type        = e($request->input('category_type', $category->category_type));
-        $category->eula_text            = e($request->input('eula_text'));
-        $category->use_default_eula     = e($request->input('use_default_eula', '0'));
-        $category->require_acceptance   = e($request->input('require_acceptance', '0'));
-        $category->checkin_email        = e($request->input('checkin_email', '0'));
+        $category->category_type        = $request->input('category_type', $category->category_type);
+        $category->eula_text            = $request->input('eula_text');
+        $category->use_default_eula     = $request->input('use_default_eula', '0');
+        $category->require_acceptance   = $request->input('require_acceptance', '0');
+        $category->checkin_email        = $request->input('checkin_email', '0');

        if ($category->save()) {
-        // Redirect to the new category page
-            return redirect()->to("admin/settings/categories")->with('success', trans('admin/categories/message.update.success'));
-        } // attempt validation
-        else {
-          // The given data did not pass validation
-            return redirect()->back()->withInput()->withErrors($category->getErrors());
+            // Redirect to the new category page
+            return redirect()->route('categories.index')->with('success', trans('admin/categories/message.update.success'));
        }
-
-        // Redirect to the category management page
-        return redirect()->back()->with('error', trans('admin/categories/message.update.error'));
-
+        // The given data did not pass validation
+        return redirect()->back()->withInput()->withErrors($category->getErrors());
    }

    /**
@@ -173,41 +152,31 @@ class CategoriesController extends Controller
    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @since [v1.0]
    * @param int $categoryId
-    * @return Redirect
-    */
-    public function getDelete($categoryId)
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy($categoryId)
    {
        // Check if the category exists
        if (is_null($category = Category::find($categoryId))) {
-            // Redirect to the blogs management page
            return redirect()->to('admin/settings/categories')->with('error', 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']));
-
        } elseif ($category->accessories()->count() > 0) {
                return redirect()->to('admin/settings/categories')->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']));
-
        } elseif ($category->components()->count() > 0) {
                return redirect()->to('admin/settings/categories')->with('error', trans('admin/categories/message.assoc_items', ['asset_type'=>'component']));
-        } else {
-
-            $category->delete();
-
-            // Redirect to the locations management page
-            return redirect()->to('admin/settings/categories')->with('success', trans('admin/categories/message.delete.success'));
        }

-
+        $category->delete();
+        // Redirect to the locations management page
+        return redirect()->to(route('categories.index'))->with('success', trans('admin/categories/message.delete.success'));
    }


-
    /**
    * Returns a view that invokes the ajax tables which actually contains
    * the content for the categories detail view, which is generated in getDataView.
@@ -216,319 +185,32 @@ class CategoriesController extends Controller
    * @see CategoriesController::getDataView() method that generates the JSON response
    * @param int $categoryId
    * @since [v1.8]
-    * @return View
-    */
-    public function getView($categoryId = null)
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function show($id)
    {
-        $category = Category::find($categoryId);
+        if ($category = Category::find($id)) {

-        if (isset($category->id)) {
-                return View::make('categories/view', compact('category'));
-        } else {
-            // Prepare the error message
-            $error = trans('admin/categories/message.does_not_exist', compact('id'));
-
-            // Redirect to the user management page
-            return redirect()->route('categories')->with('error', $error);
-        }
-
-
-    }
-
-    /**
-    * Returns a JSON response with the data to populate the bootstrap table on the
-    * cateory listing page.
-    *
-    * @todo Refactor this nastiness. Assets do not behave the same as accessories, etc.
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @see CategoriesController::getIndex() method that generates the view
-    * @since [v1.8]
-    * @return String JSON
-    */
-    public function getDatatable()
-    {
-        // Grab all the categories
-        $categories = Category::with('assets', 'accessories', 'consumables', 'components');
-
-        if (Input::has('search')) {
-            $categories = $categories->TextSearch(e(Input::get('search')));
-        }
-
-        if (Input::has('offset')) {
-            $offset = e(Input::get('offset'));
-        } else {
-            $offset = 0;
-        }
-
-        if (Input::has('limit')) {
-            $limit = e(Input::get('limit'));
-        } else {
-            $limit = 50;
-        }
-
-
-        $allowed_columns = ['id','name','category_type'];
-        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array(Input::get('sort'), $allowed_columns) ? e(Input::get('sort')) : 'created_at';
-
-        $categories = $categories->orderBy($sort, $order);
-
-        $catCount = $categories->count();
-        $categories = $categories->skip($offset)->take($limit)->get();
-
-        $rows = array();
-
-        foreach ($categories as $category) {
-
-            $actions = '<a href="'.route('update/category', $category->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;">';
-            $actions .='<i class="fa fa-pencil icon-white"></i></a>';
-            $actions .='<a data-html="false" class="btn delete-asset btn-danger btn-sm';
-            if ($category->itemCount() > 0) {
-                $actions .=' disabled';
-            }
-            $actions .=' data-toggle="modal" href="'.route('delete/category', $category->id).'" data-content="'.trans('admin/categories/message.delete.confirm').'" data-title="'.trans('general.delete').' '.htmlspecialchars($category->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
-            $rows[] = array(
-                'id'      => $category->id,
-                'name'  => (string)link_to('/admin/settings/categories/'.$category->id.'/view', $category->name) ,
-                'category_type' => ucwords($category->category_type),
-                'count'         => $category->itemCount(),
-                'acceptance'    => ($category->require_acceptance=='1') ? '<i class="fa fa-check"></i>' : '',
-                'eula'          => ($category->getEula()) ? '<i class="fa fa-check"></i>' : '',
-                'actions'       => $actions
-            );
-        }
-
-        $data = array('total' => $catCount, 'rows' => $rows);
-
-        return $data;
-    }
-
-    public function getDataViewAssets($categoryID)
-    {
-
-        $category = Category::find($categoryID);
-        $category = $category->load('assets.company', 'assets.model', 'assets.assetstatus', 'assets.assigneduser');
-        $category_assets = $category->assets();
-        if (Input::has('search')) {
-            $category_assets = $category_assets->TextSearch(e(Input::get('search')));
-        }
-
-        if (Input::has('offset')) {
-            $offset = e(Input::get('offset'));
-        } else {
-            $offset = 0;
-        }
-
-        if (Input::has('limit')) {
-            $limit = e(Input::get('limit'));
-        } else {
-            $limit = 50;
-        }
-
-        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
-
-        $allowed_columns = ['id','name','serial','asset_tag'];
-        $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
-        $count = $category_assets->count();
-        $category_assets = $category_assets->skip($offset)->take($limit)->get();
-        $rows = array();
-        foreach ($category_assets as $asset) {
-
-            $actions = '';
-            $inout='';
-
-            if ($asset->deleted_at=='') {
-                $actions = '<div style=" white-space: nowrap;"><a href="'.route('clone/hardware', $asset->id).'" class="btn btn-info btn-sm" title="Clone asset"><i class="fa fa-files-o"></i></a> <a href="'.route('update/hardware', $asset->id).'" class="btn btn-warning btn-sm"><i class="fa fa-pencil icon-white"></i></a> <a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/hardware', $asset->id).'" data-content="'.trans('admin/hardware/message.delete.confirm').'" data-title="'.trans('general.delete').' '.htmlspecialchars($asset->asset_tag).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></div>';
-            } elseif ($asset->deleted_at!='') {
-                $actions = '<a href="'.route('restore/hardware', $asset->id).'" class="btn btn-warning btn-sm"><i class="fa fa-recycle icon-white"></i></a>';
-            }
-
-            if ($asset->availableForCheckout()) {
-                if (Gate::allows('assets.checkout')) {
-                    $inout = '<a href="'.route('checkout/hardware', $asset->id).'" class="btn btn-info btn-sm">'.trans('general.checkout').'</a>';
-                }
+            if ($category->category_type=='asset') {
+                $category_type = 'hardware';
+                $category_type_route = 'assets';
+            } elseif ($category->category_type=='accessory') {
+                $category_type = 'accessories';
+                $category_type_route = 'accessories';
            } else {
-                if (Gate::allows('assets.checkin')) {
-                    $inout = '<a href="'.route('checkin/hardware', $asset->id).'" class="btn btn-primary btn-sm">'.trans('general.checkin').'</a>';
-                }
+                $category_type = $category->category_type;
+                $category_type_route = $category->category_type.'s';
            }
-
-            $rows[] = array(
-                'id' => $asset->id,
-                'name' => (string)link_to('/hardware/'.$asset->id.'/view', $asset->showAssetName()),
-                'model' => ($asset->model) ? (string)link_to('hardware/models/'.$asset->model->id.'/view', $asset->model->name) : '',
-                'asset_tag' => $asset->asset_tag,
-                'serial' => $asset->serial,
-                'assigned_to' => ($asset->assigneduser) ? (string)link_to('/admin/users/'.$asset->assigneduser->id.'/view', $asset->assigneduser->fullName()): '',
-                'change' => $inout,
-                'actions' => $actions,
-                'companyName'   => is_null($asset->company) ? '' : e($asset->company->name)
-            );
+            return view('categories/view', compact('category'))
+                ->with('category_type',$category_type)
+                ->with('category_type_route',$category_type_route);
        }

-        $data = array('total' => $count, 'rows' => $rows);
-        return $data;
+        // Prepare the error message
+        $error = trans('admin/categories/message.does_not_exist', compact('id'));
+        // Redirect to the user management page
+        return redirect()->route('categories.index')->with('error', $error);
    }


-
-    public function getDataViewAccessories($categoryID)
-    {
-
-        $category = Category::with('accessories.company')->find($categoryID);
-        $category_assets = $category->accessories;
-
-        if (Input::has('search')) {
-            $category_assets = $category_assets->TextSearch(e(Input::get('search')));
-        }
-
-        if (Input::has('offset')) {
-            $offset = e(Input::get('offset'));
-        } else {
-            $offset = 0;
-        }
-
-        if (Input::has('limit')) {
-            $limit = e(Input::get('limit'));
-        } else {
-            $limit = 50;
-        }
-
-        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
-
-        $allowed_columns = ['id','name','serial','asset_tag'];
-        $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
-        $count = $category_assets->count();
-
-        $rows = array();
-
-        foreach ($category_assets as $asset) {
-
-            $actions = '';
-            $inout='';
-
-            if ($asset->deleted_at=='') {
-                $actions = '<div style=" white-space: nowrap;"><a href="'.route('update/accessory', $asset->id).'" class="btn btn-warning btn-sm"><i class="fa fa-pencil icon-white"></i></a> <a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/accessory', $asset->id).'" data-content="'.trans('admin/hardware/message.delete.confirm').'" data-title="'.trans('general.delete').' '.htmlspecialchars($asset->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></div>';
-            }
-
-
-
-            $rows[] = array(
-                'id' => $asset->id,
-                'name' => (string)link_to_route('view/accessory', $asset->name, [$asset->id]),
-                'actions' => $actions,
-                'companyName' => Company::getName($asset),
-            );
-        }
-
-        $data = array('total' => $count, 'rows' => $rows);
-        return $data;
-    }
-
-
-    public function getDataViewConsumables($categoryID)
-    {
-
-        $category = Category::with('accessories.company')->find($categoryID);
-        $category_assets = $category->consumables;
-
-        if (Input::has('search')) {
-            $category_assets = $category_assets->TextSearch(e(Input::get('search')));
-        }
-
-        if (Input::has('offset')) {
-            $offset = e(Input::get('offset'));
-        } else {
-            $offset = 0;
-        }
-
-        if (Input::has('limit')) {
-            $limit = e(Input::get('limit'));
-        } else {
-            $limit = 50;
-        }
-
-        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
-
-        $allowed_columns = ['id','name','serial','asset_tag'];
-        $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
-        $count = $category_assets->count();
-
-        $rows = array();
-
-        foreach ($category_assets as $asset) {
-
-            $actions = '';
-            $inout='';
-
-            if ($asset->deleted_at=='') {
-                $actions = '<div style=" white-space: nowrap;"><a href="'.route('update/consumable', $asset->id).'" class="btn btn-warning btn-sm"><i class="fa fa-pencil icon-white"></i></a> <a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/consumable', $asset->id).'" data-content="'.trans('admin/hardware/message.delete.confirm').'" data-title="'.trans('general.delete').' '.htmlspecialchars($asset->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></div>';
-            }
-
-
-
-            $rows[] = array(
-                'id' => $asset->id,
-                'name' => (string) link_to_route('view/consumable', $asset->name, [$asset->id]),
-                'actions' => $actions,
-                'companyName' => Company::getName($asset),
-            );
-        }
-
-        $data = array('total' => $count, 'rows' => $rows);
-        return $data;
-    }
-
-    public function getDataViewComponent($categoryID)
-    {
-
-        $category = Category::with('accessories.company')->find($categoryID);
-        $category_assets = $category->components;
-
-        if (Input::has('search')) {
-            $category_assets = $category_assets->TextSearch(e(Input::get('search')));
-        }
-
-        if (Input::has('offset')) {
-            $offset = e(Input::get('offset'));
-        } else {
-            $offset = 0;
-        }
-
-        if (Input::has('limit')) {
-            $limit = e(Input::get('limit'));
-        } else {
-            $limit = 50;
-        }
-
-        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
-
-        $allowed_columns = ['id','name','serial','asset_tag'];
-        $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
-        $count = $category_assets->count();
-
-        $rows = array();
-
-        foreach ($category_assets as $asset) {
-
-            $actions = '';
-            $inout='';
-
-            if ($asset->deleted_at=='') {
-                $actions = '<div style=" white-space: nowrap;"><a href="'.route('update/component', $asset->id).'" class="btn btn-warning btn-sm"><i class="fa fa-pencil icon-white"></i></a> <a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/component', $asset->id).'" data-content="'.trans('admin/hardware/message.delete.confirm').'" data-title="'.trans('general.delete').' '.htmlspecialchars($asset->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></div>';
-            }
-
-
-
-            $rows[] = array(
-                'id' => $asset->id,
-                'name' => (string)link_to_route('view/accessory', $asset->name, [$asset->id]),
-                'actions' => $actions,
-                'companyName' => Company::getName($asset),
-            );
-        }
-
-        $data = array('total' => $count, 'rows' => $rows);
-        return $data;
-    }
 }
--- a/app/Http/Controllers/CompaniesController.php
+++ b/app/Http/Controllers/CompaniesController.php
@@ -6,6 +6,7 @@ use Input;
 use Lang;
 use Redirect;
 use View;
+use Illuminate\Http\Request;

 /**
 * This controller handles all actions related to Companies for
@@ -22,11 +23,11 @@ final class CompaniesController extends Controller
    *
    * @author [Abdullah Alansari] [<ahimta@gmail.com>]
    * @since [v1.8]
-    * @return View
-    */
-    public function getIndex()
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function index()
    {
-        return View::make('companies/index')->with('companies', Company::all());
+        return view('companies/index')->with('companies', Company::all());
    }

    /**
@@ -34,33 +35,31 @@ final class CompaniesController extends Controller
    *
    * @author [Abdullah Alansari] [<ahimta@gmail.com>]
    * @since [v1.8]
-    * @return View
-    */
-    public function getCreate()
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function create()
    {
-        return View::make('companies/edit')->with('item', new Company);
+        return view('companies/edit')->with('item', new Company);
    }

    /**
-    * Save data from new company form.
-    *
-    * @author [Abdullah Alansari] [<ahimta@gmail.com>]
-    * @since [v1.8]
-    * @return Redirect
-    */
-    public function postCreate()
+     * Save data from new company form.
+     *
+     * @author [Abdullah Alansari] [<ahimta@gmail.com>]
+     * @since [v1.8]
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function store(Request $request)
    {
        $company = new Company;
-
-            $company->name = e(Input::get('name'));
+        $company->name = $request->input('name');

        if ($company->save()) {
-            return redirect()->to('admin/settings/companies')
+            return redirect()->route('companies.index')
                ->with('success', trans('admin/companies/message.create.success'));
-        } else {
-            return redirect()->back()->withInput()->withErrors($company->getErrors());
        }
-
+        return redirect()->back()->withInput()->withErrors($company->getErrors());
    }


@@ -70,44 +69,40 @@ final class CompaniesController extends Controller
    * @author [Abdullah Alansari] [<ahimta@gmail.com>]
    * @since [v1.8]
    * @param int $companyId
-    * @return View
-    */
-    public function getEdit($companyId)
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function edit($companyId)
    {
        if (is_null($item = Company::find($companyId))) {
-            return redirect()->to('admin/settings/companies')
+            return redirect()->route('companies.index')
                ->with('error', trans('admin/companies/message.does_not_exist'));
-        } else {
-            return View::make('companies/edit')->with('item', $item);
        }
+        return view('companies/edit')->with('item', $item);
    }

    /**
-    * Save data from edit company form.
-    *
-    * @author [Abdullah Alansari] [<ahimta@gmail.com>]
-    * @since [v1.8]
-    * @param int $companyId
-    * @return Redirect
-    */
-    public function postEdit($companyId)
+     * Save data from edit company form.
+     *
+     * @author [Abdullah Alansari] [<ahimta@gmail.com>]
+     * @since [v1.8]
+     * @param Request $request
+     * @param int $companyId
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function update(Request $request, $companyId)
    {
        if (is_null($company = Company::find($companyId))) {
-            return redirect()->to('admin/settings/companies')->with('error', trans('admin/companies/message.does_not_exist'));
-        } else {
-
-
-            $company->name = e(Input::get('name'));
-
-            if ($company->save()) {
-                return redirect()->to('admin/settings/companies')
-                    ->with('success', trans('admin/companies/message.update.success'));
-            } else {
-                return redirect()->to("admin/settings/companies/$companyId/edit")
-                    ->with('error', trans('admin/companies/message.update.error'));
-            }
-
+            return redirect()->route('companies.index')->with('error', trans('admin/companies/message.does_not_exist'));
        }
+
+        $company->name = $request->input('name');
+
+        if ($company->save()) {
+            return redirect()->route('companies.index')
+                ->with('success', trans('admin/companies/message.update.success'));
+        }
+        return redirect()->route('companies.edit', ['company' => $companyId])
+            ->with('error', trans('admin/companies/message.update.error'));
    }

    /**
@@ -116,17 +111,17 @@ final class CompaniesController extends Controller
    * @author [Abdullah Alansari] [<ahimta@gmail.com>]
    * @since [v1.8]
    * @param int $companyId
-    * @return Redirect
-    */
-    public function postDelete($companyId)
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy($companyId)
    {
        if (is_null($company = Company::find($companyId))) {
-            return redirect()->to('admin/settings/companies')
+            return redirect()->route('companies.index')
                ->with('error', trans('admin/companies/message.not_found'));
        } else {
            try {
                $company->delete();
-                return redirect()->to('admin/settings/companies')
+                return redirect()->route('companies.index')
                    ->with('success', trans('admin/companies/message.delete.success'));
            } catch (\Illuminate\Database\QueryException $exception) {
            /*
@@ -134,7 +129,7 @@ final class CompaniesController extends Controller
                 * For example when rows in other tables are referencing this company
                 */
                if ($exception->getCode() == 23000) {
-                    return redirect()->to('admin/settings/companies')
+                    return redirect()->route('companies.index')
                        ->with('error', trans('admin/companies/message.assoc_users'));
                } else {
                    throw $exception;
@@ -142,4 +137,16 @@ final class CompaniesController extends Controller
            }
        }
    }
+
+    public function show($id) {
+        $this->authorize('view', Company::class);
+
+        if (is_null($company = Company::find($id))) {
+            return redirect()->route('companies.index')
+                ->with('error', trans('admin/companies/message.not_found'));
+        } else {
+            return view('companies/view')->with('company',$company);
+        }
+
+    }
 }
--- a/app/Http/Controllers/ComponentsController.php
+++ b/app/Http/Controllers/ComponentsController.php
@@ -2,9 +2,9 @@
 namespace App\Http\Controllers;

 use App\Helpers\Helper;
-use App\Models\Actionlog;
 use App\Models\Company;
 use App\Models\Component;
+use App\Models\CustomField;
 use App\Models\Setting;
 use App\Models\User;
 use App\Models\Asset;
@@ -37,11 +37,12 @@ class ComponentsController extends Controller
    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @see ComponentsController::getDatatable() method that generates the JSON response
    * @since [v3.0]
-    * @return View
+     * @return \Illuminate\Contracts\View\View
    */
-    public function getIndex()
+    public function index()
    {
-        return View::make('components/index');
+        $this->authorize('view', Component::class);
+        return view('components/index');
    }


@@ -51,20 +52,17 @@ class ComponentsController extends Controller
    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @see ComponentsController::postCreate() method that stores the data
    * @since [v3.0]
-    * @return View
+    * @return \Illuminate\Contracts\View\View
    */
-    public function getCreate()
+    public function create()
    {
+        $this->authorize('create', Component::class);
        // Show the page
-        $category_list = Helper::categoryList('component');
-        $company_list = Helper::companyList();
-        $location_list = Helper::locationsList();
-
-        return View::make('components/edit')
+        return view('components/edit')
            ->with('item', new Component)
-            ->with('category_list', $category_list)
-            ->with('company_list', $company_list)
-            ->with('location_list', $location_list);
+            ->with('category_list', Helper::categoryList('component'))
+            ->with('company_list', Helper::companyList())
+            ->with('location_list', Helper::locationsList());
    }


@@ -74,48 +72,28 @@ class ComponentsController extends Controller
    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @see ComponentsController::getCreate() method that generates the view
    * @since [v3.0]
-    * @return Redirect
-    */
-    public function postCreate()
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function store()
    {
-
-        // create a new model instance
+        $this->authorize('create', Component::class);
        $component = new Component();
-
-        // Update the component data
-        $component->name                   = e(Input::get('name'));
-        $component->category_id            = e(Input::get('category_id'));
-        $component->location_id            = e(Input::get('location_id'));
+        $component->name                   = Input::get('name');
+        $component->category_id            = Input::get('category_id');
+        $component->location_id            = Input::get('location_id');
        $component->company_id             = Company::getIdForCurrentUser(Input::get('company_id'));
-        $component->order_number           = e(Input::get('order_number'));
-        $component->min_amt                = e(Input::get('min_amt'));
-        $component->serial                 = e(Input::get('serial'));
+        $component->order_number           = Input::get('order_number');
+        $component->min_amt                = Input::get('min_amt');
+        $component->serial                 = Input::get('serial');
+        $component->purchase_date       = Input::get('purchase_date');
+        $component->purchase_cost       = request('purchase_cost');
+        $component->qty                    = Input::get('qty');
+        $component->user_id                = Auth::id();

-        if (e(Input::get('purchase_date')) == '') {
-            $component->purchase_date       =  null;
-        } else {
-            $component->purchase_date       = e(Input::get('purchase_date'));
-        }
-
-        if (e(Input::get('purchase_cost')) == '0.00') {
-            $component->purchase_cost       =  null;
-        } else {
-            $component->purchase_cost       = Helper::ParseFloat(e(Input::get('purchase_cost')));
-        }
-
-        $component->qty                    = e(Input::get('qty'));
-        $component->user_id                = Auth::user()->id;
-
-        // Was the component created?
        if ($component->save()) {
-            $component->logCreate();
-            // Redirect to the new component  page
-            return redirect()->to("admin/components")->with('success', trans('admin/components/message.create.success'));
+            return redirect()->route('components.index')->with('success', trans('admin/components/message.create.success'));
        }
-
        return redirect()->back()->withInput()->withErrors($component->getErrors());
-
-
    }

    /**
@@ -125,26 +103,20 @@ class ComponentsController extends Controller
    * @see ComponentsController::postEdit() method that stores the data.
    * @since [v3.0]
    * @param int $componentId
-    * @return View
-    */
-    public function getEdit($componentId = null)
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function edit($componentId = null)
    {
-        // Check if the component exists
        if (is_null($item = Component::find($componentId))) {
-            // Redirect to the blogs management page
-            return redirect()->to('admin/components')->with('error', trans('admin/components/message.does_not_exist'));
-        } elseif (!Company::isCurrentUserHasAccess($item)) {
-            return redirect()->to('admin/components')->with('error', trans('general.insufficient_permissions'));
+            return redirect()->route('components.index')->with('error', trans('admin/components/message.does_not_exist'));
        }

-        $category_list =  Helper::categoryList('component');
-        $company_list = Helper::companyList();
-        $location_list = Helper::locationsList();
+        $this->authorize('update', $item);

-        return View::make('components/edit', compact('item'))
-            ->with('category_list', $category_list)
-            ->with('company_list', $company_list)
-            ->with('location_list', $location_list);
+        return view('components/edit', compact('item'))
+            ->with('category_list', Helper::categoryList('component'))
+            ->with('company_list', Helper::companyList())
+            ->with('location_list', Helper::locationsList());
    }


@@ -155,53 +127,33 @@ class ComponentsController extends Controller
    * @see ComponentsController::getEdit() method presents the form.
    * @param int $componentId
    * @since [v3.0]
-    * @return Redirect
-    */
-    public function postEdit($componentId = null)
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function update($componentId = null)
    {
-        // Check if the blog post exists
        if (is_null($component = Component::find($componentId))) {
-            // Redirect to the blogs management page
-            return redirect()->to('admin/components')->with('error', trans('admin/components/message.does_not_exist'));
-        } elseif (!Company::isCurrentUserHasAccess($component)) {
-            return redirect()->to('admin/components')->with('error', trans('general.insufficient_permissions'));
+            return redirect()->route('components.index')->with('error', trans('admin/components/message.does_not_exist'));
        }

+        $this->authorize('update', $component);
+

        // Update the component data
-        $component->name                   = e(Input::get('name'));
-        $component->category_id            = e(Input::get('category_id'));
-        $component->location_id            = e(Input::get('location_id'));
+        $component->name                   = Input::get('name');
+        $component->category_id            = Input::get('category_id');
+        $component->location_id            = Input::get('location_id');
        $component->company_id             = Company::getIdForCurrentUser(Input::get('company_id'));
-        $component->order_number           = e(Input::get('order_number'));
-        $component->min_amt                = e(Input::get('min_amt'));
-        $component->serial                 = e(Input::get('serial'));
+        $component->order_number           = Input::get('order_number');
+        $component->min_amt                = Input::get('min_amt');
+        $component->serial                 = Input::get('serial');
+        $component->purchase_date          = Input::get('purchase_date');
+        $component->purchase_cost          = request('purchase_cost');
+        $component->qty                    = Input::get('qty');

-        if (e(Input::get('purchase_date')) == '') {
-            $component->purchase_date       =  null;
-        } else {
-            $component->purchase_date       = e(Input::get('purchase_date'));
-        }
-
-        if (e(Input::get('purchase_cost')) == '0.00') {
-            $component->purchase_cost       =  null;
-        } else {
-            $component->purchase_cost       = Helper::ParseFloat(e(Input::get('purchase_cost')));
-        }
-
-        $component->qty                    = e(Input::get('qty'));
-
-        // Was the component created?
        if ($component->save()) {
-            // Redirect to the new component page
-            return redirect()->to("admin/components")->with('success', trans('admin/components/message.update.success'));
+            return redirect()->route('components.index')->with('success', trans('admin/components/message.update.success'));
        }
-
        return redirect()->back()->withInput()->withErrors($component->getErrors());
-
-
-
-
    }

    /**
@@ -210,32 +162,28 @@ class ComponentsController extends Controller
    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @since [v3.0]
    * @param int $componentId
-    * @return Redirect
-    */
-    public function getDelete($componentId)
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy($componentId)
    {
-        // Check if the blog post exists
        if (is_null($component = Component::find($componentId))) {
-            // Redirect to the blogs management page
-            return redirect()->to('admin/components')->with('error', trans('admin/components/message.not_found'));
-        } elseif (!Company::isCurrentUserHasAccess($component)) {
-            return redirect()->to('admin/components')->with('error', trans('general.insufficient_permissions'));
+            return redirect()->route('components.index')->with('error', trans('admin/components/message.not_found'));
        }

-            $component->delete();
-
-            // Redirect to the locations management page
-            return redirect()->to('admin/components')->with('success', trans('admin/components/message.delete.success'));
-
+        $this->authorize('delete', $component);
+        $component->delete();
+        return redirect()->route('components.index')->with('success', trans('admin/components/message.delete.success'));
    }

    public function postBulk($componentId = null)
    {
+        //$this->authorize('checkout', $component)
        echo 'Stubbed - not yet complete';
    }

    public function postBulkSave($componentId = null)
    {
+        //$this->authorize('edit', Component::class);
        echo 'Stubbed - not yet complete';
    }

@@ -247,29 +195,20 @@ class ComponentsController extends Controller
    * @see ComponentsController::getDataView() method that generates the JSON response
    * @since [v3.0]
    * @param int $componentId
-    * @return View
-    */
-    public function getView($componentId = null)
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function show($componentId = null)
    {
        $component = Component::find($componentId);

        if (isset($component->id)) {
-
-
-            if (!Company::isCurrentUserHasAccess($component)) {
-                return redirect()->to('admin/components')->with('error', trans('general.insufficient_permissions'));
-            } else {
-                return View::make('components/view', compact('component'));
-            }
-        } else {
-            // Prepare the error message
-            $error = trans('admin/components/message.does_not_exist', compact('id'));
-
-            // Redirect to the user management page
-            return redirect()->route('components')->with('error', $error);
+            $this->authorize('view', $component);
+            return view('components/view', compact('component'));
        }
-
-
+        // Prepare the error message
+        $error = trans('admin/components/message.does_not_exist', compact('id'));
+        // Redirect to the user management page
+        return redirect()->route('components.index')->with('error', $error);
    }

    /**
@@ -279,50 +218,41 @@ class ComponentsController extends Controller
    * @see ComponentsController::postCheckout() method that stores the data.
    * @since [v3.0]
    * @param int $componentId
-    * @return View
-    */
+    * @return \Illuminate\Contracts\View\View
+     */
    public function getCheckout($componentId)
    {
        // Check if the component exists
        if (is_null($component = Component::find($componentId))) {
            // Redirect to the component management page with error
-            return redirect()->to('components')->with('error', trans('admin/components/message.not_found'));
-        } elseif (!Company::isCurrentUserHasAccess($component)) {
-            return redirect()->to('admin/components')->with('error', trans('general.insufficient_permissions'));
+            return redirect()->route('components.index')->with('error', trans('admin/components/message.not_found'));
        }
-
-        // Get the dropdown of assets and then pass it to the checkout view
-        $assets_list = Helper::detailedAssetList();
-
-        return View::make('components/checkout', compact('component'))->with('assets_list', $assets_list);
-
+        $this->authorize('checkout', $component);
+        return view('components/checkout', compact('component'))->with('assets_list', Helper::detailedAssetList());
    }

    /**
-    * Validate and store checkout data.
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @see ComponentsController::getCheckout() method that returns the form.
-    * @since [v3.0]
-    * @param int $componentId
-    * @return Redirect
-    */
+     * Validate and store checkout data.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @see ComponentsController::getCheckout() method that returns the form.
+     * @since [v3.0]
+     * @param Request $request
+     * @param int $componentId
+     * @return \Illuminate\Http\RedirectResponse
+     */
    public function postCheckout(Request $request, $componentId)
    {
-
-
-
        // Check if the component exists
        if (is_null($component = Component::find($componentId))) {
            // Redirect to the component management page with error
-            return redirect()->to('components')->with('error', trans('admin/components/message.not_found'));
-        } elseif (!Company::isCurrentUserHasAccess($component)) {
-            return redirect()->to('admin/components')->with('error', trans('general.insufficient_permissions'));
+            return redirect()->route('components.index')->with('error', trans('admin/components/message.not_found'));
        }

+        $this->authorize('checkout', $component);

        $max_to_checkout = $component->numRemaining();
-        $validator = Validator::make($request->all(),[
+        $validator = Validator::make($request->all(), [
            "asset_id"          => "required",
            "assigned_qty"      => "required|numeric|between:1,$max_to_checkout"
        ]);
@@ -339,159 +269,25 @@ class ComponentsController extends Controller
      // Check if the user exists
        if (is_null($asset = Asset::find($asset_id))) {
            // Redirect to the component management page with error
-            return redirect()->to('admin/components')->with('error', trans('admin/components/message.asset_does_not_exist'));
+            return redirect()->route('components.index')->with('error', trans('admin/components/message.asset_does_not_exist'));
        }
-        
+
      // Update the component data
        $component->asset_id =   $asset_id;

-        $component->assets()->attach($component->id, array(
-        'component_id' => $component->id,
-        'user_id' => $admin_user->id,
-        'created_at' => date('Y-m-d H:i:s'),
-        'assigned_qty' => e(Input::get('assigned_qty')),
-        'asset_id' => $asset_id));
-
-        $logaction = $component->logCheckout(e(Input::get('note')), $asset_id);
-
-        $settings = Setting::getSettings();
-
-        if ($settings->slack_endpoint) {
-
-            $slack_settings = [
-                'username' => $settings->botname,
-                'channel' => $settings->slack_channel,
-                'link_names' => true
-            ];
-
-            $client = new \Maknz\Slack\Client($settings->slack_endpoint, $slack_settings);
-
-            try {
-                    $client->attach([
-                        'color' => 'good',
-                        'fields' => [
-                            [
-                                'title' => 'Checked Out:',
-                                'value' => class_basename(strtoupper($logaction->item_type)).' <'.config('app.url').'/admin/components/'.$component->id.'/view'.'|'.$component->name.'> checked out to <'.config('app.url').'/hardware/'.$asset->id.'/view|'.$asset->showAssetName().'> by <'.config('app.url').'/admin/users/'.$admin_user->id.'/view'.'|'.$admin_user->fullName().'>.'
-                            ],
-                            [
-                                'title' => 'Note:',
-                                'value' => e($logaction->note)
-                            ],
-                        ]
-                    ])->send('Component Checked Out');
-
-            } catch (Exception $e) {
-
-            }
-        }
-
-      // Redirect to the new component page
-        return redirect()->to("admin/components")->with('success', trans('admin/components/message.checkout.success'));
-
-
+        $component->assets()->attach($component->id, [
+            'component_id' => $component->id,
+            'user_id' => $admin_user->id,
+            'created_at' => date('Y-m-d H:i:s'),
+            'assigned_qty' => Input::get('assigned_qty'),
+            'asset_id' => $asset_id
+        ]);

+        $component->logCheckout(e(Input::get('note')), $asset_id);
+        return redirect()->route('components.index')->with('success', trans('admin/components/message.checkout.success'));
    }


-    /**
-    * Generates the JSON response for accessories listing view.
-    *
-    * For debugging, see at /api/accessories/list
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @since [v3.0]
-    * @return string JSON
-    **/
-    public function getDatatable()
-    {
-        $components = Company::scopeCompanyables(Component::select('components.*')->whereNull('components.deleted_at')
-            ->with('company', 'location', 'category'));
-
-        if (Input::has('search')) {
-            $components = $components->TextSearch(Input::get('search'));
-        }
-
-        if (Input::has('offset')) {
-            $offset = e(Input::get('offset'));
-        } else {
-            $offset = 0;
-        }
-
-        if (Input::has('limit')) {
-            $limit = e(Input::get('limit'));
-        } else {
-            $limit = 50;
-        }
-
-        $allowed_columns = ['id','name','min_amt','order_number','serial','purchase_date','purchase_cost','companyName','category','total_qty'];
-        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
-
-        switch ($sort) {
-            case 'category':
-                $components = $components->OrderCategory($order);
-                break;
-            case 'location':
-                $components = $components->OrderLocation($order);
-                break;
-            case 'companyName':
-                $components = $components->OrderCompany($order);
-                break;
-            default:
-                $components = $components->orderBy($sort, $order);
-                break;
-        }
-
-        $consumCount = $components->count();
-        $components = $components->skip($offset)->take($limit)->get();
-
-        $rows = array();
-
-        foreach ($components as $component) {
-            $actions = '<nobr>';
-            if (Gate::allows('components.checkout')) {
-                $actions .= '<a href="' . route('checkout/component',
-                        $component->id) . '" style="margin-right:5px;" class="btn btn-info btn-sm ' . (($component->numRemaining() > 0) ? '' : ' disabled') . '" ' . (($component->numRemaining() > 0) ? '' : ' disabled') . '>' . trans('general.checkout') . '</a>';
-            }
-
-            if (Gate::allows('components.edit')) {
-                $actions .= '<a href="' . route('update/component',
-                        $component->id) . '" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a>';
-            }
-
-            if (Gate::allows('components.delete')) {
-                $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/component',
-                        $component->id) . '" data-content="' . trans('admin/components/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($component->name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
-            }
-
-            $actions .='</nobr>';
-            $company = $component->company;
-
-            $rows[] = array(
-                'checkbox'      =>'<div class="text-center"><input type="checkbox" name="component['.$component->id.']" class="one_required"></div>',
-                'id'            => $component->id,
-                'name'          => (string)link_to('admin/components/'.$component->id.'/view', e($component->name)),
-                'serial_number'          => $component->serial,
-                'location'   => ($component->location) ? e($component->location->name) : '',
-                'qty'           => e($component->qty),
-                'min_amt'           => e($component->min_amt),
-                'category'           => ($component->category) ? e($component->category->name) : 'Missing category',
-                'order_number'  => e($component->order_number),
-                'purchase_date'  => e($component->purchase_date),
-                'purchase_cost'  => Helper::formatCurrencyOutput($component->purchase_cost),
-                'numRemaining'  => $component->numRemaining(),
-                'actions'       => $actions,
-                'companyName'   => is_null($company) ? '' : e($company->name),
-            );
-        }
-
-        $data = array('total' => $consumCount, 'rows' => $rows);
-
-        return $data;
-
-    }
-
    /**
    * Return JSON data to populate the components view,
    *
@@ -503,22 +299,20 @@ class ComponentsController extends Controller
    */
    public function getDataView($componentId)
    {
-        //$component = Component::find($componentID);
-        $component = Component::with('assets')->find($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[] = array(
-            'name' => (string)link_to('/hardware/'.$component_assignment->id.'/view', e($component_assignment->showAssetName())),
-            'qty' => e($component_assignment->pivot->assigned_qty),
-            'created_at' => ($component_assignment->created_at->format('Y-m-d H:i:s')=='-0001-11-30 00:00:00') ? '' : $component_assignment->created_at->format('Y-m-d H:i:s'),
-            );
+            $rows[] = $component_assignment->present()->forDataTable($all_custom_fields);
        }

        $componentCount = $component->assets->count();
--- a/app/Http/Controllers/ConsumablesController.php
+++ b/app/Http/Controllers/ConsumablesController.php
@@ -3,11 +3,11 @@
 namespace App\Http\Controllers;

 use App\Helpers\Helper;
-use App\Models\Actionlog;
 use App\Models\Company;
 use App\Models\Consumable;
 use App\Models\Setting;
 use App\Models\User;
+use App\Notifications\CheckoutNotification;
 use Auth;
 use Config;
 use DB;
@@ -34,11 +34,12 @@ class ConsumablesController extends Controller
    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @see ConsumablesController::getDatatable() method that generates the JSON response
    * @since [v1.0]
-    * @return View
-    */
-    public function getIndex()
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function index()
    {
-        return View::make('consumables/index');
+        $this->authorize('index', Consumable::class);
+        return view('consumables/index');
    }


@@ -48,22 +49,18 @@ class ConsumablesController extends Controller
    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @see ConsumablesController::postCreate() method that stores the form data
    * @since [v1.0]
-    * @return View
-    */
-    public function getCreate()
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function create()
    {
+        $this->authorize('create', Consumable::class);
        // Show the page
-        $category_list = Helper::categoryList('consumable');
-        $company_list = Helper::companyList();
-        $location_list = Helper::locationsList();
-        $manufacturer_list = Helper::manufacturerList();
-
-        return View::make('consumables/edit')
+        return view('consumables/edit')
            ->with('item', new Consumable)
-            ->with('category_list', $category_list)
-            ->with('company_list', $company_list)
-            ->with('location_list', $location_list)
-            ->with('manufacturer_list', $manufacturer_list);
+            ->with('category_list', Helper::categoryList('consumable'))
+            ->with('company_list', Helper::companyList())
+            ->with('location_list', Helper::locationsList())
+            ->with('manufacturer_list', Helper::manufacturerList());
    }


@@ -73,46 +70,32 @@ class ConsumablesController extends Controller
    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @see ConsumablesController::getCreate() method that returns the form view
    * @since [v1.0]
-    * @return Redirect
-    */
-    public function postCreate()
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function store()
    {
+        $this->authorize('create', Consumable::class);
        $consumable = new Consumable();
-        $consumable->name                   = e(Input::get('name'));
-        $consumable->category_id            = e(Input::get('category_id'));
-        $consumable->location_id            = e(Input::get('location_id'));
+        $consumable->name                   = Input::get('name');
+        $consumable->category_id            = Input::get('category_id');
+        $consumable->location_id            = Input::get('location_id');
        $consumable->company_id             = Company::getIdForCurrentUser(Input::get('company_id'));
-        $consumable->order_number           = e(Input::get('order_number'));
-        $consumable->min_amt                = e(Input::get('min_amt'));
-        $consumable->manufacturer_id         = e(Input::get('manufacturer_id'));
-        $consumable->model_number               = e(Input::get('model_number'));
-        $consumable->item_no         = e(Input::get('item_no'));
+        $consumable->order_number           = Input::get('order_number');
+        $consumable->min_amt                = Input::get('min_amt');
+        $consumable->manufacturer_id        = Input::get('manufacturer_id');
+        $consumable->model_number           = Input::get('model_number');
+        $consumable->item_no                = Input::get('item_no');
+        $consumable->purchase_date          = Input::get('purchase_date');
+        $consumable->purchase_cost          = Helper::ParseFloat(Input::get('purchase_cost'));
+        $consumable->qty                    = Input::get('qty');
+        $consumable->user_id                = Auth::id();

-        if (e(Input::get('purchase_date')) == '') {
-            $consumable->purchase_date       =  null;
-        } else {
-            $consumable->purchase_date       = e(Input::get('purchase_date'));
-        }
-
-        if (e(Input::get('purchase_cost')) == '0.00') {
-            $consumable->purchase_cost       =  null;
-        } else {
-            $consumable->purchase_cost       = Helper::ParseFloat(e(Input::get('purchase_cost')));
-        }
-
-        $consumable->qty                    = e(Input::get('qty'));
-        $consumable->user_id                = Auth::user()->id;
-
-        // Was the consumable created?
        if ($consumable->save()) {
-            $consumable->logCreate();
-            // Redirect to the new consumable  page
-            return redirect()->to("admin/consumables")->with('success', trans('admin/consumables/message.create.success'));
+            return redirect()->route('consumables.index')->with('success', trans('admin/consumables/message.create.success'));
        }

        return redirect()->back()->withInput()->withErrors($consumable->getErrors());

-
    }

    /**
@@ -122,28 +105,21 @@ class ConsumablesController extends Controller
    * @param  int $consumableId
    * @see ConsumablesController::postEdit() method that stores the form data.
    * @since [v1.0]
-    * @return View
-    */
-    public function getEdit($consumableId = null)
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function edit($consumableId = null)
    {
-        // Check if the consumable exists
        if (is_null($item = Consumable::find($consumableId))) {
-            // Redirect to the blogs management page
-            return redirect()->to('admin/consumables')->with('error', trans('admin/consumables/message.does_not_exist'));
-        } elseif (!Company::isCurrentUserHasAccess($item)) {
-            return redirect()->to('admin/consumables')->with('error', trans('general.insufficient_permissions'));
+            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist'));
        }

-        $category_list =  Helper::categoryList('consumable');
-        $company_list = Helper::companyList();
-        $location_list = Helper::locationsList();
-        $manufacturer_list = Helper::manufacturerList();
+        $this->authorize($item);

-        return View::make('consumables/edit', compact('item'))
-            ->with('category_list', $category_list)
-            ->with('company_list', $company_list)
-            ->with('location_list', $location_list)
-            ->with('manufacturer_list', $manufacturer_list);
+        return view('consumables/edit', compact('item'))
+            ->with('category_list', Helper::categoryList('consumable'))
+            ->with('company_list', Helper::companyList())
+            ->with('location_list', Helper::locationsList())
+            ->with('manufacturer_list', Helper::manufacturerList());
    }


@@ -154,46 +130,33 @@ class ConsumablesController extends Controller
    * @param  int $consumableId
    * @see ConsumablesController::getEdit() method that stores the form data.
    * @since [v1.0]
-    * @return Redirect
-    */
-    public function postEdit($consumableId = null)
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function update($consumableId = null)
    {
        if (is_null($consumable = Consumable::find($consumableId))) {
-            return redirect()->to('admin/consumables')->with('error', trans('admin/consumables/message.does_not_exist'));
-        } elseif (!Company::isCurrentUserHasAccess($consumable)) {
-            return redirect()->to('admin/consumables')->with('error', trans('general.insufficient_permissions'));
+            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist'));
        }

-        $consumable->name                   = e(Input::get('name'));
-        $consumable->category_id            = e(Input::get('category_id'));
-        $consumable->location_id            = e(Input::get('location_id'));
+        $this->authorize($consumable);
+
+        $consumable->name                   = Input::get('name');
+        $consumable->category_id            = Input::get('category_id');
+        $consumable->location_id            = Input::get('location_id');
        $consumable->company_id             = Company::getIdForCurrentUser(Input::get('company_id'));
-        $consumable->order_number           = e(Input::get('order_number'));
-        $consumable->min_amt                   = e(Input::get('min_amt'));
-        $consumable->manufacturer_id         = e(Input::get('manufacturer_id'));
-        $consumable->model_number               = e(Input::get('model_number'));
-        $consumable->item_no         = e(Input::get('item_no'));
-
-        if (e(Input::get('purchase_date')) == '') {
-            $consumable->purchase_date       =  null;
-        } else {
-            $consumable->purchase_date       = e(Input::get('purchase_date'));
-        }
-
-        if (e(Input::get('purchase_cost')) == '0.00') {
-            $consumable->purchase_cost       =  null;
-        } else {
-            $consumable->purchase_cost       = Helper::ParseFloat(e(Input::get('purchase_cost')));
-        }
-
-        $consumable->qty                    = Helper::ParseFloat(e(Input::get('qty')));
+        $consumable->order_number           = Input::get('order_number');
+        $consumable->min_amt                   = Input::get('min_amt');
+        $consumable->manufacturer_id         = Input::get('manufacturer_id');
+        $consumable->model_number               = Input::get('model_number');
+        $consumable->item_no         = Input::get('item_no');
+        $consumable->purchase_date       = Input::get('purchase_date');
+        $consumable->purchase_cost       = Helper::ParseFloat(Input::get('purchase_cost'));
+        $consumable->qty                    = Helper::ParseFloat(Input::get('qty'));

        if ($consumable->save()) {
-            return redirect()->to("admin/consumables")->with('success', trans('admin/consumables/message.update.success'));
+            return redirect()->route('consumables.index')->with('success', trans('admin/consumables/message.update.success'));
        }
-
        return redirect()->back()->withInput()->withErrors($consumable->getErrors());
-
    }

    /**
@@ -202,27 +165,19 @@ class ConsumablesController extends Controller
    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @param  int $consumableId
    * @since [v1.0]
-    * @return Redirect
-    */
-    public function getDelete($consumableId)
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy($consumableId)
    {
-        // Check if the blog post exists
        if (is_null($consumable = Consumable::find($consumableId))) {
-            // Redirect to the blogs management page
-            return redirect()->to('admin/consumables')->with('error', trans('admin/consumables/message.not_found'));
-        } elseif (!Company::isCurrentUserHasAccess($consumable)) {
-            return redirect()->to('admin/consumables')->with('error', trans('general.insufficient_permissions'));
+            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.not_found'));
        }
-
-            $consumable->delete();
-
-            // Redirect to the locations management page
-            return redirect()->to('admin/consumables')->with('success', trans('admin/consumables/message.delete.success'));
-
+        $this->authorize($consumable);
+        $consumable->delete();
+        // Redirect to the locations management page
+        return redirect()->route('consumables.index')->with('success', trans('admin/consumables/message.delete.success'));
    }

-
-
    /**
    * Return a view to display component information.
    *
@@ -230,29 +185,16 @@ class ConsumablesController extends Controller
    * @see ConsumablesController::getDataView() method that generates the JSON response
    * @since [v1.0]
    * @param int $consumableId
-    * @return View
-    */
-    public function getView($consumableId = null)
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function show($consumableId = null)
    {
        $consumable = Consumable::find($consumableId);
-
+        $this->authorize($consumable);
        if (isset($consumable->id)) {
-
-
-            if (!Company::isCurrentUserHasAccess($consumable)) {
-                return redirect()->to('admin/consumables')->with('error', trans('general.insufficient_permissions'));
-            } else {
-                return View::make('consumables/view', compact('consumable'));
-            }
-        } else {
-            // Prepare the error message
-            $error = trans('admin/consumables/message.does_not_exist', compact('id'));
-
-            // Redirect to the user management page
-            return redirect()->route('consumables')->with('error', $error);
+            return view('consumables/view', compact('consumable'));
        }
-
-
+        return redirect()->route('consumables')->with('error', trans('admin/consumables/message.does_not_exist', compact('id')));
    }

    /**
@@ -262,23 +204,15 @@ class ConsumablesController extends Controller
    * @see ConsumablesController::postCheckout() method that stores the data.
    * @since [v1.0]
    * @param int $consumableId
-    * @return View
-    */
+    * @return \Illuminate\Contracts\View\View
+     */
    public function getCheckout($consumableId)
    {
-        // Check if the consumable exists
        if (is_null($consumable = Consumable::find($consumableId))) {
-            // Redirect to the consumable management page with error
-            return redirect()->to('consumables')->with('error', trans('admin/consumables/message.not_found'));
-        } elseif (!Company::isCurrentUserHasAccess($consumable)) {
-            return redirect()->to('admin/consumables')->with('error', trans('general.insufficient_permissions'));
+            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.not_found'));
        }
-
-        // Get the dropdown of users and then pass it to the checkout view
-        $users_list = Helper::usersList();
-
-        return View::make('consumables/checkout', compact('consumable'))->with('users_list', $users_list);
-
+        $this->authorize('checkout', $consumable);
+        return view('consumables/checkout', compact('consumable'))->with('users_list', Helper::usersList());
    }

    /**
@@ -288,71 +222,35 @@ class ConsumablesController extends Controller
    * @see ConsumablesController::getCheckout() method that returns the form.
    * @since [v1.0]
    * @param int $consumableId
-    * @return Redirect
-    */
+    * @return \Illuminate\Http\RedirectResponse
+     */
    public function postCheckout($consumableId)
    {
-      // Check if the consumable exists
        if (is_null($consumable = Consumable::find($consumableId))) {
-            // Redirect to the consumable management page with error
-            return redirect()->to('consumables')->with('error', trans('admin/consumables/message.not_found'));
-        } elseif (!Company::isCurrentUserHasAccess($consumable)) {
-            return redirect()->to('admin/consumables')->with('error', trans('general.insufficient_permissions'));
+            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.not_found'));
        }

+        $this->authorize('checkout', $consumable);
+
        $admin_user = Auth::user();
        $assigned_to = e(Input::get('assigned_to'));

-      // Check if the user exists
+        // Check if the user exists
        if (is_null($user = User::find($assigned_to))) {
            // Redirect to the consumable management page with error
-            return redirect()->to('admin/consumables')->with('error', trans('admin/consumables/message.user_does_not_exist'));
+            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.user_does_not_exist'));
        }

-      // Update the consumable data
+        // Update the consumable data
        $consumable->assigned_to = e(Input::get('assigned_to'));

-        $consumable->users()->attach($consumable->id, array(
-        'consumable_id' => $consumable->id,
-        'user_id' => $admin_user->id,
-        'assigned_to' => e(Input::get('assigned_to'))));
+        $consumable->users()->attach($consumable->id, [
+            'consumable_id' => $consumable->id,
+            'user_id' => $admin_user->id,
+            'assigned_to' => e(Input::get('assigned_to'))
+        ]);

        $logaction = $consumable->logCheckout(e(Input::get('note')));
-
-        $settings = Setting::getSettings();
-
-        if ($settings->slack_endpoint) {
-
-            $slack_settings = [
-                'username' => $settings->botname,
-                'channel' => $settings->slack_channel,
-                'link_names' => true
-            ];
-
-            $client = new \Maknz\Slack\Client($settings->slack_endpoint, $slack_settings);
-
-            try {
-                    $client->attach([
-                        'color' => 'good',
-                        'fields' => [
-                            [
-                                'title' => 'Checked Out:',
-                                'value' => 'Consumable <'.config('app.url').'/admin/consumables/'.$consumable->id.'/view'.'|'.$consumable->name.'> checked out to <'.config('app.url').'/admin/users/'.$user->id.'/view|'.$user->fullName().'> by <'.config('app.url').'/admin/users/'.$admin_user->id.'/view'.'|'.$admin_user->fullName().'>.'
-                            ],
-                            [
-                                'title' => 'Note:',
-                                'value' => e($logaction->note)
-                            ],
-                        ]
-                    ])->send('Consumable Checked Out');
-
-            } catch (Exception $e) {
-
-            }
-        }
-
-        $consumable_user = DB::table('consumables_users')->where('assigned_to', '=', $consumable->assigned_to)->where('consumable_id', '=', $consumable->id)->first();
-
        $data['log_id'] = $logaction->id;
        $data['eula'] = $consumable->getEula();
        $data['first_name'] = $user->first_name;
@@ -361,7 +259,6 @@ class ConsumablesController extends Controller
        $data['note'] = $logaction->note;
        $data['require_acceptance'] = $consumable->requireAcceptance();

-
        if (($consumable->requireAcceptance()=='1')  || ($consumable->getEula())) {

            Mail::send('emails.accept-asset', $data, function ($m) use ($user) {
@@ -372,118 +269,11 @@ class ConsumablesController extends Controller
        }

      // Redirect to the new consumable page
-        return redirect()->to("admin/consumables")->with('success', trans('admin/consumables/message.checkout.success'));
-
-
+        return redirect()->route('consumables.index')->with('success', trans('admin/consumables/message.checkout.success'));

    }


-    /**
-    * Returns the JSON response containing the the consumables data.
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @see ConsumablesController::getIndex() method that returns the view that consumes the JSON.
-    * @since [v1.0]
-    * @param int $consumableId
-    * @return View
-    */
-    public function getDatatable()
-    {
-        $consumables = Company::scopeCompanyables(
-            Consumable::select('consumables.*')
-            ->whereNull('consumables.deleted_at')
-            ->with('company', 'location', 'category', 'users', 'manufacturer')
-        );
-
-        if (Input::has('search')) {
-            $consumables = $consumables->TextSearch(e(Input::get('search')));
-        }
-
-        if (Input::has('offset')) {
-            $offset = e(Input::get('offset'));
-        } else {
-            $offset = 0;
-        }
-
-        if (Input::has('limit')) {
-            $limit = e(Input::get('limit'));
-        } else {
-            $limit = 50;
-        }
-
-        $allowed_columns = ['id','name','order_number','min_amt','purchase_date','purchase_cost','companyName','category','model_number', 'item_no', 'manufacturer'];
-        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
-
-        switch ($sort) {
-            case 'category':
-                $consumables = $consumables->OrderCategory($order);
-                break;
-            case 'location':
-                $consumables = $consumables->OrderLocation($order);
-                break;
-            case 'manufacturer':
-                $consumables = $consumables->OrderManufacturer($order);
-                break;
-            case 'companyName':
-                $consumables = $consumables->OrderCompany($order);
-                break;
-            default:
-                $consumables = $consumables->orderBy($sort, $order);
-                break;
-        }
-
-        $consumCount = $consumables->count();
-        $consumables = $consumables->skip($offset)->take($limit)->get();
-
-        $rows = array();
-
-        foreach ($consumables as $consumable) {
-            $actions = '<nobr>';
-            if (Gate::allows('consumables.checkout')) {
-                $actions .= '<a href="' . route('checkout/consumable',
-                        $consumable->id) . '" style="margin-right:5px;" class="btn btn-info btn-sm" ' . (($consumable->numRemaining() > 0) ? '' : ' disabled') . '>' . trans('general.checkout') . '</a>';
-            }
-
-            if (Gate::allows('consumables.edit')) {
-                $actions .= '<a href="' . route('update/consumable',
-                        $consumable->id) . '" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a>';
-            }
-            if (Gate::allows('consumables.delete')) {
-                $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/consumable',
-                        $consumable->id) . '" data-content="' . trans('admin/consumables/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($consumable->name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
-            }
-
-            $actions .='</nobr>';
-
-            $company = $consumable->company;
-
-            $rows[] = array(
-                'id'            => $consumable->id,
-                'name'          => (string)link_to('admin/consumables/'.$consumable->id.'/view', e($consumable->name)),
-                'location'   => ($consumable->location) ? e($consumable->location->name) : '',
-                'min_amt'           => e($consumable->min_amt),
-                'qty'           => e($consumable->qty),
-                'manufacturer'  => ($consumable->manufacturer) ? (string) link_to('/admin/settings/manufacturers/'.$consumable->manufacturer_id.'/view', $consumable->manufacturer->name): '',
-                'model_number'      => e($consumable->model_number),
-                'item_no'       => e($consumable->item_no),
-                'category'      => ($consumable->category) ? (string) link_to('/admin/settings/categories/'.$consumable->category_id.'/view', $consumable->category->name) : 'Missing category',
-                'order_number'  => e($consumable->order_number),
-                'purchase_date'  => e($consumable->purchase_date),
-                'purchase_cost'  => Helper::formatCurrencyOutput($consumable->purchase_cost),
-                'numRemaining'  => $consumable->numRemaining(),
-                'actions'       => $actions,
-                'companyName'   => is_null($company) ? '' : e($company->name),
-            );
-        }
-
-        $data = array('total' => $consumCount, 'rows' => $rows);
-
-        return $data;
-
-    }
-
    /**
    * Returns a JSON response containing details on the users associated with this consumable.
    *
@@ -491,8 +281,8 @@ class ConsumablesController extends Controller
    * @see ConsumablesController::getView() method that returns the form.
    * @since [v1.0]
    * @param int $consumableId
-    * @return View
-    */
+    * @return array
+     */
    public function getDataView($consumableId)
    {
        //$consumable = Consumable::find($consumableID);
@@ -511,15 +301,15 @@ class ConsumablesController extends Controller
        if (!Company::isCurrentUserHasAccess($consumable)) {
            return ['total' => 0, 'rows' => []];
        }
-
+        $this->authorize('view', Component::class);
        $rows = array();

        foreach ($consumable->consumableAssigments as $consumable_assignment) {
-            $rows[] = array(
-            'name' => (string)link_to('/admin/users/'.$consumable_assignment->user->id.'/view', e($consumable_assignment->user->fullName())),
-            'created_at' => ($consumable_assignment->created_at->format('Y-m-d H:i:s')=='-0001-11-30 00:00:00') ? '' : $consumable_assignment->created_at->format('Y-m-d H:i:s'),
-            'admin' => ($consumable_assignment->admin) ? e($consumable_assignment->admin->fullName()) : '',
-            );
+            $rows[] = [
+                'name' => $consumable_assignment->user->present()->nameUrl(),
+                'created_at' => ($consumable_assignment->created_at->format('Y-m-d H:i:s')=='-0001-11-30 00:00:00') ? '' : $consumable_assignment->created_at->format('Y-m-d H:i:s'),
+                'admin' => ($consumable_assignment->admin) ? $consumable_assignment->admin->present()->nameUrl() : '',
+            ];
        }

        $consumableCount = $consumable->users->count();
--- a/app/Http/Controllers/CustomFieldsController.php
+++ b/app/Http/Controllers/CustomFieldsController.php
@@ -11,6 +11,7 @@ use App\Models\AssetModel;
 use Lang;
 use Auth;
 use Illuminate\Http\Request;
+use App\Helpers\Helper;
 use Log;

 /**
@@ -35,77 +36,15 @@ class CustomFieldsController extends Controller
    */
    public function index()
    {
-        //
-        $fieldsets=CustomFieldset::with("fields", "models")->get();
-        //$fieldsets=CustomFieldset::all();
-        $fields=CustomField::with("fieldset")->get();
-        //$fields=CustomField::all();
-        return View::make("custom_fields.index")->with("custom_fieldsets", $fieldsets)->with("custom_fields", $fields);
+
+        $fieldsets = CustomFieldset::with("fields", "models")->get();
+        $fields = CustomField::with("fieldset")->get();
+        return view("custom_fields.index")->with("custom_fieldsets", $fieldsets)->with("custom_fields", $fields);
    }


-    /**
-    * Returns a view with a form for creating a new custom fieldset.
-    *
-    * @author [Brady Wetherington] [<uberbrady@gmail.com>]
-    * @since [v1.8]
-    * @return View
-    */
-    public function create()
-    {
-        //
-        return View::make("custom_fields.create");
-    }


-    /**
-    * Validates and stores a new custom fieldset.
-    *
-    * @author [Brady Wetherington] [<uberbrady@gmail.com>]
-    * @since [v1.8]
-    * @return Redirect
-    */
-    public function store(Request $request)
-    {
-        //
-        $cfset = new CustomFieldset(
-            [
-                "name" => e($request->get("name")),
-                "user_id" => Auth::user()->id]
-            );
-
-        $validator=Validator::make(Input::all(), $cfset->rules);
-        if ($validator->passes()) {
-            $cfset->save();
-            return redirect()->route("admin.custom_fields.show", [$cfset->id])->with('success', trans('admin/custom_fields/message.fieldset.create.success'));
-        } else {
-            return redirect()->back()->withInput()->withErrors($validator);
-        }
-    }
-
-    /**
-    * Associate the custom field with a custom fieldset.
-    *
-    * @author [Brady Wetherington] [<uberbrady@gmail.com>]
-    * @since [v1.8]
-    * @return View
-    */
-    public function associate($id)
-    {
-
-        $set = CustomFieldset::find($id);
-
-        foreach ($set->fields as $field) {
-            if ($field->id == Input::get('field_id')) {
-                return redirect()->route("admin.custom_fields.show", [$id])->withInput()->withErrors(['field_id' => trans('admin/custom_fields/message.field.already_added')]);
-            }
-        }
-
-        $results=$set->fields()->attach(Input::get('field_id'), ["required" => (Input::get('required') == "on"),"order" => Input::get('order')]);
-
-        return redirect()->route("admin.custom_fields.show", [$id])->with("success", trans('admin/custom_fields/message.field.create.assoc_success'));
-    }
-

    /**
    * Returns a view with a form to create a new custom field.
@@ -115,9 +54,10 @@ class CustomFieldsController extends Controller
    * @since [v1.8]
    * @return View
    */
-    public function createField()
+    public function create()
    {
-        return View::make("custom_fields.create_field");
+
+        return view("custom_fields.fields.edit")->with('field', new CustomField());
    }


@@ -129,13 +69,14 @@ class CustomFieldsController extends Controller
    * @since [v1.8]
    * @return Redirect
    */
-    public function storeField(Request $request)
+    public function store(Request $request)
    {
        $field = new CustomField([
-            "name" => e($request->get("name")),
-            "element" => e($request->get("element")),
-            "field_values" => e($request->get("field_values")),
-            "field_encrypted" => e($request->get("field_encrypted", 0)),
+            "name" => $request->get("name"),
+            "element" => $request->get("element"),
+            "help_text" => $request->get("help_text"),
+            "field_values" => $request->get("field_values"),
+            "field_encrypted" => $request->get("field_encrypted", 0),
            "user_id" => Auth::user()->id
        ]);

@@ -148,12 +89,12 @@ class CustomFieldsController extends Controller
        }


+        $validator = Validator::make(Input::all(), $field->rules);

-        $validator=Validator::make(Input::all(), $field->rules);
        if ($validator->passes()) {
            $results = $field->save();
            if ($results) {
-                return redirect()->route("admin.custom_fields.index")->with("success", trans('admin/custom_fields/message.field.create.success'));
+                return redirect()->route("fields.index")->with("success", trans('admin/custom_fields/message.field.create.success'));
            } else {
                dd($field);
                return redirect()->back()->withInput()->with('error', trans('admin/custom_fields/message.field.create.error'));
@@ -176,7 +117,7 @@ class CustomFieldsController extends Controller
        $field = CustomField::find($field_id);

        if ($field->fieldset()->detach($fieldset_id)) {
-            return redirect()->route("admin.custom_fields.index")->with("success", trans('admin/custom_fields/message.field.delete.success'));
+            return redirect()->route('fieldsets.show', ['fieldset' => $fieldset_id])->with("success", trans('admin/custom_fields/message.field.delete.success'));
        }

        return redirect()->back()->withErrors(['message' => "Field is in-use"]);
@@ -189,7 +130,7 @@ class CustomFieldsController extends Controller
    * @since [v1.8]
    * @return Redirect
    */
-    public function deleteField($field_id)
+    public function destroy($field_id)
    {
        $field = CustomField::find($field_id);

@@ -197,115 +138,63 @@ class CustomFieldsController extends Controller
            return redirect()->back()->withErrors(['message' => "Field is in-use"]);
        } else {
            $field->delete();
-            return redirect()->route("admin.custom_fields.index")->with("success", trans('admin/custom_fields/message.field.delete.success'));
+            return redirect()->route("fields.index")->with("success", trans('admin/custom_fields/message.field.delete.success'));
        }
    }

-    /**
-    * Validates and stores a new custom field.
-    *
-    * @author [Brady Wetherington] [<uberbrady@gmail.com>]
-    * @param int $id
-    * @since [v1.8]
-    * @return View
-    */
-    public function show($id)
-    {
-        $cfset = CustomFieldset::with('fields')->where('id','=',$id)->orderBy('id','ASC')->first();
-        $custom_fields_list = ["" => "Add New Field to Fieldset"] + CustomField::lists("name", "id")->toArray();
-
-        $maxid = 0;
-        foreach ($cfset->fields() as $field) {
-            if ($field->pivot->order > $maxid) {
-                $maxid=$field->pivot->order;
-            }
-            if (isset($custom_fields_list[$field->id])) {
-                unset($custom_fields_list[$field->id]);
-            }
-        }
-
-        return View::make("custom_fields.show")->with("custom_fieldset", $cfset)->with("maxid", $maxid+1)->with("custom_fields_list", $custom_fields_list);
-    }


    /**
-    * What the actual fuck, Brady?
+    * Return a view to edit a custom field
    *
-    * @todo Uhh, build this?
-    * @author [Brady Wetherington] [<uberbrady@gmail.com>]
+    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @param  int  $id
-    * @since [v1.8]
-    * @return Fuckall
+    * @since [v4.0]
+    * @return View
    */
    public function edit($id)
    {
-        //
+        $field = CustomField::find($id);
+        return view("custom_fields.fields.edit")->with('field', $field);
    }


    /**
-    * GET IN THE SEA BRADY.
+    * Store the updated field
    *
-    * @todo Uhh, build this too?
-    * @author [Brady Wetherington] [<uberbrady@gmail.com>]
-    * @param  int  $id
-    * @since [v1.8]
-    * @return Fuckall
-    */
-    public function update($id)
-    {
-        //
-    }
-
-
-    /**
-    * Validates a custom fieldset and then deletes if it has no models associated.
+    * @todo Allow encrypting/decrypting if encryption status changes
    *
-    * @author [Brady Wetherington] [<uberbrady@gmail.com>]
+    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @param  int  $id
-    * @since [v1.8]
-    * @return View
+    * @since [v4.0]
+    * @return Redirect
    */
-    public function destroy($id)
+    public function update(Request $request, $id)
    {
-        //
-        $fieldset = CustomFieldset::find($id);
+        $field =  CustomField::find($id);

-        $models = AssetModel::where("fieldset_id", "=", $id);
-        if ($models->count() == 0) {
-            $fieldset->delete();
-            return redirect()->route("admin.custom_fields.index")->with("success", trans('admin/custom_fields/message.fieldset.delete.success'));
+        $field->name = e($request->get("name"));
+        $field->element = e($request->get("element"));
+        $field->field_values = e($request->get("field_values"));
+        $field->field_encrypted = e($request->get("field_encrypted", 0));
+        $field->user_id = Auth::user()->id;
+        $field->help_text = $request->get("help_text");
+
+        if (!in_array(Input::get('format'), array_keys(CustomField::$PredefinedFormats))) {
+            $field->format = e($request->get("custom_format"));
        } else {
-            return redirect()->route("admin.custom_fields.index")->with("error", trans('admin/custom_fields/message.fieldset.delete.in_use'));
+            $field->format = e($request->get("format"));
        }
+
+        $validator = Validator::make(Input::all(), $field->rules);
+
+        if ($field->save()) {
+           return redirect()->route("fields.index")->with("success", trans('admin/custom_fields/message.field.update.success'));
+        }
+
+       return redirect()->back()->withInput()->withErrors($validator);
    }


-    /**
-     * Reorder the custom fields within a fieldset
-     *
-     * @author [Brady Wetherington] [<uberbrady@gmail.com>]
-     * @param  int  $id
-     * @since [v3.0]
-     * @return Array
-     */
-    public function postReorder(Request $request, $id)
-    {
-        $fieldset = CustomFieldset::find($id);
-        $fields = array();
-        $order_array = array();

-        $items = $request->input('item');
-
-        foreach ($items as $order => $field_id) {
-            $order_array[$field_id] = $order;
-        }
-
-        foreach ($fieldset->fields as $field) {
-            $fields[$field->id] = ['required' => $field->pivot->required, 'order' => $order_array[$field->id]];
-        }
-
-        return $fieldset->fields()->sync($fields);
-
-    }
 }
--- a/app/Http/Controllers/CustomFieldsetsController.php
+++ b/app/Http/Controllers/CustomFieldsetsController.php
@@ -0,0 +1,171 @@
+<?php
+namespace App\Http\Controllers;
+
+use View;
+use App\Models\CustomFieldset;
+use App\Models\CustomField;
+use Input;
+use Validator;
+use Redirect;
+use App\Models\AssetModel;
+use Lang;
+use Auth;
+use Illuminate\Http\Request;
+use Log;
+
+/**
+ * This controller handles all actions related to Custom Asset Fields for
+ * the Snipe-IT Asset Management application.
+ *
+ * @todo Improve documentation here.
+ * @todo Check for raw DB queries and try to convert them to query builder statements
+ * @version    v2.0
+ * @author [Brady Wetherington] [<uberbrady@gmail.com>]
+ */
+
+class CustomFieldsetsController extends Controller
+{
+
+        /**
+        * Validates and stores a new custom field.
+        *
+        * @author [Brady Wetherington] [<uberbrady@gmail.com>]
+        * @param int $id
+        * @since [v1.8]
+        * @return View
+        */
+    public function show($id)
+    {
+        $cfset = CustomFieldset::with('fields')->where('id', '=', $id)->orderBy('id', 'ASC')->first();
+        $custom_fields_list = ["" => "Add New Field to Fieldset"] + CustomField::pluck("name", "id")->toArray();
+
+        $maxid = 0;
+        foreach ($cfset->fields() as $field) {
+            if ($field->pivot->order > $maxid) {
+                $maxid=$field->pivot->order;
+            }
+            if (isset($custom_fields_list[$field->id])) {
+                unset($custom_fields_list[$field->id]);
+            }
+        }
+
+        return view("custom_fields.fieldsets.view")->with("custom_fieldset", $cfset)->with("maxid", $maxid+1)->with("custom_fields_list", $custom_fields_list);
+    }
+
+
+    /**
+    * Returns a view with a form for creating a new custom fieldset.
+    *
+    * @author [Brady Wetherington] [<uberbrady@gmail.com>]
+    * @since [v1.8]
+    * @return View
+    */
+    public function create()
+    {
+        return view("custom_fields.fieldsets.edit");
+    }
+
+
+    /**
+    * Validates and stores a new custom fieldset.
+    *
+    * @author [Brady Wetherington] [<uberbrady@gmail.com>]
+    * @since [v1.8]
+    * @return Redirect
+    */
+    public function store(Request $request)
+    {
+        $cfset = new CustomFieldset(
+            [
+                "name" => e($request->get("name")),
+                "user_id" => Auth::user()->id]
+        );
+
+        $validator = Validator::make(Input::all(), $cfset->rules);
+        if ($validator->passes()) {
+            $cfset->save();
+            return redirect()->route("fieldsets.show", [$cfset->id])->with('success', trans('admin/custom_fields/message.fieldset.create.success'));
+        } else {
+            return redirect()->back()->withInput()->withErrors($validator);
+        }
+    }
+
+
+
+
+    /**
+    * What the actual fuck, Brady?
+    *
+    * @todo Uhh, build this?
+    * @author [Brady Wetherington] [<uberbrady@gmail.com>]
+    * @param  int  $id
+    * @since [v1.8]
+    * @return Fuckall
+    */
+    public function edit($id)
+    {
+        //
+    }
+
+
+    /**
+    * GET IN THE SEA BRADY.
+    *
+    * @todo Uhh, build this too?
+    * @author [Brady Wetherington] [<uberbrady@gmail.com>]
+    * @param  int  $id
+    * @since [v1.8]
+    * @return Fuckall
+    */
+    public function update($id)
+    {
+        //
+    }
+
+
+    /**
+    * Validates a custom fieldset and then deletes if it has no models associated.
+    *
+    * @author [Brady Wetherington] [<uberbrady@gmail.com>]
+    * @param  int  $id
+    * @since [v1.8]
+    * @return View
+    */
+    public function destroy($id)
+    {
+        //
+        $fieldset = CustomFieldset::find($id);
+
+        $models = AssetModel::where("fieldset_id", "=", $id);
+        if ($models->count() == 0) {
+            $fieldset->delete();
+            return redirect()->route("fields.show")->with("success", trans('admin/custom_fields/message.fieldset.delete.success'));
+        } else {
+            return redirect()->route("fields.show")->with("error", trans('admin/custom_fields/message.fieldset.delete.in_use'));
+        }
+    }
+
+
+    /**
+    * Associate the custom field with a custom fieldset.
+    *
+    * @author [Brady Wetherington] [<uberbrady@gmail.com>]
+    * @since [v1.8]
+    * @return View
+    */
+    public function associate($id)
+    {
+
+        $set = CustomFieldset::find($id);
+
+        foreach ($set->fields as $field) {
+            if ($field->id == Input::get('field_id')) {
+                return redirect()->route("fieldsets.show", [$id])->withInput()->withErrors(['field_id' => trans('admin/custom_fields/message.field.already_added')]);
+            }
+        }
+
+        $results=$set->fields()->attach(Input::get('field_id'), ["required" => (Input::get('required') == "on"),"order" => Input::get('order')]);
+
+        return redirect()->route("fieldsets.show", [$id])->with("success", trans('admin/custom_fields/message.field.create.assoc_success'));
+    }
+}
--- a/app/Http/Controllers/DashboardController.php
+++ b/app/Http/Controllers/DashboardController.php
@@ -30,53 +30,20 @@ class DashboardController extends Controller
        // Show the page
        if (Auth::user()->hasAccess('admin')) {

-            $asset_stats['total'] = Asset::Hardware()->count();
+            $asset_stats=null;

-            $asset_stats['rtd']['total'] = Asset::Hardware()->RTD()->count();
+            $counts['asset'] = \App\Models\Asset::count();
+            $counts['accessory'] = \App\Models\Accessory::count();
+            $counts['license'] = \App\Models\License::assetcount();
+            $counts['consumable'] = \App\Models\Consumable::count();
+            $counts['grand_total'] =  $counts['asset'] +  $counts['accessory'] +  $counts['license'] +  $counts['consumable'];

-            if ($asset_stats['rtd']['total'] > 0) {
-                $asset_stats['rtd']['percent'] = round(($asset_stats['rtd']['total']/$asset_stats['total']) * 100);
-            } else {
-                $asset_stats['rtd']['percent'] = 0;
+            if ((!file_exists(storage_path().'/oauth-private.key')) || (!file_exists(storage_path().'/oauth-public.key'))) {
+                \Artisan::call('passport:install');
+                \Artisan::call('migrate', ['--force' => true]);
            }

-
-            $asset_stats['pending']['total'] = Asset::Hardware()->Pending()->count();
-
-            if ($asset_stats['pending']['total'] > 0) {
-                $asset_stats['pending']['percent'] = round(($asset_stats['pending']['total']/$asset_stats['total']) * 100);
-            } else {
-                $asset_stats['pending']['percent'] = 0;
-            }
-
-
-            $asset_stats['deployed']['total'] = Asset::Hardware()->Deployed()->count();
-
-            if ($asset_stats['deployed']['total'] > 0) {
-                 $asset_stats['deployed']['percent'] = round(($asset_stats['deployed']['total']/$asset_stats['total']) * 100);
-            } else {
-                $asset_stats['deployed']['percent'] = 0;
-            }
-
-
-            $asset_stats['undeployable']['total'] = Asset::Hardware()->Undeployable()->count();
-
-            if ($asset_stats['undeployable']['total'] > 0) {
-                $asset_stats['undeployable']['percent'] = round(($asset_stats['undeployable']['total']/$asset_stats['total']) * 100);
-            } else {
-                $asset_stats['undeployable']['percent'] = 0;
-            }
-
-            $asset_stats['archived']['total'] = Asset::Hardware()->Archived()->count();
-
-            if ($asset_stats['archived']['total'] > 0) {
-                $asset_stats['archived']['percent'] = round(($asset_stats['archived']['total']/$asset_stats['total']) * 100);
-            } else {
-                $asset_stats['archived']['percent'] = 0;
-            }
-
-
-            return View::make('dashboard')->with('asset_stats', $asset_stats);
+            return view('dashboard')->with('asset_stats', $asset_stats)->with('counts', $counts);
        } else {
        // Redirect to the profile page
            return redirect()->intended('account/view-assets');
--- a/app/Http/Controllers/DepartmentsController.php
+++ b/app/Http/Controllers/DepartmentsController.php
@@ -0,0 +1,164 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\Models\Department;
+use App\Helpers\Helper;
+use Auth;
+
+class DepartmentsController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('auth');
+        parent::__construct();
+    }
+
+    /**
+     * Returns a view that invokes the ajax tables which actually contains
+     * the content for the assets listing, which is generated in getDatatable.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @see AssetController::getDatatable() method that generates the JSON response
+     * @since [v4.0]
+     * @return View
+     */
+    public function index(Request $request)
+    {
+        $this->authorize('index', Department::class);
+        if ($request->has('company_id')) {
+            $company = Company::find($request->input('company_id'));
+        } else {
+            $company = null;
+        }
+        return view('departments/index')->with('company',$company);
+
+    }
+
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $this->authorize('create', Department::class);
+        $department = new Department;
+        $department->fill($request->all());
+        $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());
+
+    }
+
+    /**
+     * Returns a view that invokes the ajax tables which actually contains
+     * the content for the department detail page.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param int $id
+     * @since [v4.0]
+     * @return \Illuminate\Contracts\View\View
+     */
+    public function show($id)
+    {
+        $department = Department::find($id);
+
+        if (isset($department->id)) {
+            return view('departments/view', compact('department'));
+        }
+        return redirect()->route('departments.index')->with('error', trans('admin/departments/message.does_not_exist', compact('id')));
+    }
+
+
+    /**
+     * Returns a form view used to create a new department.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @see DepartmentsController::postCreate() method that validates and stores the data
+     * @since [v4.0]
+     * @return \Illuminate\Contracts\View\View
+     */
+    public function create()
+    {
+        return view('departments/edit')->with('item', new Department)
+            ->with('manager_list', Helper::managerList())
+            ->with('location_list', Helper::locationsList())
+            ->with('company_list', Helper::companyList());
+    }
+
+
+    /**
+     * Validates and deletes selected department.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param int $locationId
+     * @since [v4.0]
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy($id)
+    {
+        if (is_null($department = Department::find($id))) {
+            return redirect()->to(route('departments.index'))->with('error', trans('admin/departments/message.not_found'));
+        }
+
+        if ($department->users->count() > 0) {
+            return redirect()->to(route('departments.index'))->with('error', trans('admin/departments/message.assoc_users'));
+        }
+
+        $department->delete();
+        return redirect()->back()->with('success', trans('admin/departments/message.delete.success'));
+
+    }
+
+    /**
+     * Makes a form view to edit location information.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @see LocationsController::postCreate() method that validates and stores
+     * @param int $locationId
+     * @since [v1.0]
+     * @return \Illuminate\Contracts\View\View
+     */
+    public function edit($id = null)
+    {
+        if (is_null($item = Department::find($id))) {
+            return redirect()->back()->with('error', trans('admin/locations/message.does_not_exist'));
+        }
+        return view('departments/edit', compact('item'))
+            ->with('manager_list', Helper::managerList())
+            ->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'));
+        }
+
+
+        $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());
+    }
+    
+
+}
--- a/app/Http/Controllers/DepreciationsController.php
+++ b/app/Http/Controllers/DepreciationsController.php
@@ -1,7 +1,7 @@
 <?php
 namespace App\Http\Controllers;

-use Input;
+use App\Helpers\Helper;
 use Lang;
 use App\Models\Depreciation;
 use Redirect;
@@ -10,6 +10,7 @@ use DB;
 use Str;
 use View;
 use Auth;
+use Illuminate\Http\Request;

 /**
 * This controller handles all actions related to Depreciations for
@@ -26,12 +27,12 @@ class DepreciationsController extends Controller
    * @author [A. Gianotto] [<snipe@snipe.net]
    * @see DepreciationsController::getDatatable() method that generates the JSON response
    * @since [v1.0]
-    * @return View
-    */
-    public function getIndex()
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function index()
    {
        // Show the page
-        return View::make('depreciations/index', compact('depreciations'));
+        return view('depreciations/index', compact('depreciations'));
    }


@@ -41,45 +42,39 @@ class DepreciationsController extends Controller
    * @author [A. Gianotto] [<snipe@snipe.net]
    * @see DepreciationsController::postCreate()
    * @since [v1.0]
-    * @return View
-    */
-    public function getCreate()
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function create()
    {
        // Show the page
-        return View::make('depreciations/edit')->with('item', new Depreciation);
+        return view('depreciations/edit')->with('item', new Depreciation);
    }


    /**
-    * Validates and stores the new depreciation data.
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net]
-    * @see DepreciationsController::postCreate()
-    * @since [v1.0]
-    * @return Redirect
-    */
-    public function postCreate()
+     * Validates and stores the new depreciation data.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net]
+     * @see DepreciationsController::postCreate()
+     * @since [v1.0]
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function store(Request $request)
    {
-
-      // get the POST data
-        $new = Input::all();
-
-      // create a new instance
+        // create a new instance
        $depreciation = new Depreciation();
+        // Depreciation data
+        $depreciation->name             = $request->input('name');
+        $depreciation->months           = $request->input('months');
+        $depreciation->user_id          = Auth::id();

-      // Depreciation data
-        $depreciation->name            = e(Input::get('name'));
-        $depreciation->months    = e(Input::get('months'));
-        $depreciation->user_id          = Auth::user()->id;
-
-      // Was the asset created?
+        // Was the asset created?
        if ($depreciation->save()) {
            // Redirect to the new depreciation  page
-            return redirect()->to("admin/settings/depreciations")->with('success', trans('admin/depreciations/message.create.success'));
+            return redirect()->route('depreciations.index')->with('success', trans('admin/depreciations/message.create.success'));
        }
-
        return redirect()->back()->withInput()->withErrors($depreciation->getErrors());
-
    }

    /**
@@ -89,138 +84,76 @@ class DepreciationsController extends Controller
    * @see DepreciationsController::postEdit()
    * @param int $depreciationId
    * @since [v1.0]
-    * @return View
-    */
-    public function getEdit($depreciationId = null)
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function edit($depreciationId = null)
    {
        // Check if the depreciation exists
        if (is_null($item = Depreciation::find($depreciationId))) {
            // Redirect to the blogs management page
-            return redirect()->to('admin/settings/depreciations')->with('error', trans('admin/depreciations/message.does_not_exist'));
+            return redirect()->route('depreciations.index')->with('error', trans('admin/depreciations/message.does_not_exist'));
        }

-        return View::make('depreciations/edit', compact('item'));
+        return view('depreciations/edit', compact('item'));
    }


    /**
-    * Validates and stores the updated depreciation data.
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net]
-    * @see DepreciationsController::getEdit()
-    * @param int $depreciationId
-    * @since [v1.0]
-    * @return Redirect
-    */
-    public function postEdit($depreciationId = null)
+     * Validates and stores the updated depreciation data.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net]
+     * @see DepreciationsController::getEdit()
+     * @param Request $request
+     * @param int $depreciationId
+     * @return \Illuminate\Http\RedirectResponse
+     * @since [v1.0]
+     */
+    public function update(Request $request, $depreciationId = null)
    {
        // Check if the depreciation exists
        if (is_null($depreciation = Depreciation::find($depreciationId))) {
            // Redirect to the blogs management page
-            return redirect()->to('admin/settings/depreciations')->with('error', trans('admin/depreciations/message.does_not_exist'));
+            return redirect()->route('depreciations.index')->with('error', trans('admin/depreciations/message.does_not_exist'));
        }

        // Depreciation data
-        $depreciation->name      = e(Input::get('name'));
-        $depreciation->months    = e(Input::get('months'));
+        $depreciation->name      = $request->input('name');
+        $depreciation->months    = $request->input('months');

        // Was the asset created?
        if ($depreciation->save()) {
            // Redirect to the depreciation page
-            return redirect()->to("admin/settings/depreciations/")->with('success', trans('admin/depreciations/message.update.success'));
+            return redirect()->route("depreciations.index")->with('success', trans('admin/depreciations/message.update.success'));
        }
-
        return redirect()->back()->withInput()->withErrors($depreciation->getErrors());
-
-
    }

    /**
-    * Validates and deletes a selected depreciation.
-    *
-    * This is a hard-delete. We do not currently soft-delete depreciations.
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net]
-    * @since [v1.0]
-    * @return Redirect
-    */
-    public function getDelete($depreciationId)
+     * Validates and deletes a selected depreciation.
+     *
+     * This is a hard-delete. We do not currently soft-delete depreciations.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net]
+     * @since [v1.0]
+     * @param integer $depreciationId
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy($depreciationId)
    {
        // Check if the depreciation exists
        if (is_null($depreciation = Depreciation::find($depreciationId))) {
-            // Redirect to the blogs management page
-            return redirect()->to('admin/settings/depreciations')->with('error', trans('admin/depreciations/message.not_found'));
+            return redirect()->route('depreciations.index')->with('error', trans('admin/depreciations/message.not_found'));
        }

        if ($depreciation->has_models() > 0) {
-
            // Redirect to the asset management page
-            return redirect()->to('admin/settings/depreciations')->with('error', trans('admin/depreciations/message.assoc_users'));
-        } else {
-
-            $depreciation->delete();
-
-            // Redirect to the depreciations management page
-            return redirect()->to('admin/settings/depreciations')->with('success', trans('admin/depreciations/message.delete.success'));
+            return redirect()->route('depreciations.index')->with('error', trans('admin/depreciations/message.assoc_users'));
        }

+        $depreciation->delete();
+        // Redirect to the depreciations management page
+        return redirect()->route('depreciations.index')->with('success', trans('admin/depreciations/message.delete.success'));
    }


-    /**
-    * Generates the JSON used to display the depreciation listing.
-    *
-    * @see DepreciationsController::getIndex()
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @param  string  $status
-    * @since [v1.2]
-    * @return String JSON
-    */
-    public function getDatatable()
-    {
-        $depreciations = Depreciation::select(array('id','name','months'));
-
-        if (Input::has('search')) {
-            $depreciations = $depreciations->TextSearch(e(Input::get('search')));
-        }
-
-        if (Input::has('offset')) {
-            $offset = e(Input::get('offset'));
-        } else {
-            $offset = 0;
-        }
-
-        if (Input::has('limit')) {
-            $limit = e(Input::get('limit'));
-        } else {
-            $limit = 50;
-        }
-
-        $allowed_columns = ['id','name','months'];
-        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
-
-        $depreciations->orderBy($sort, $order);
-
-        $depreciationsCount = $depreciations->count();
-        $depreciations = $depreciations->skip($offset)->take($limit)->get();
-
-        $rows = array();
-
-        foreach ($depreciations as $depreciation) {
-            $actions = '<a href="'.route('update/depreciations', $depreciation->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/depreciations', $depreciation->id).'" data-content="'.trans('admin/depreciations/message.delete.confirm').'" data-title="'.trans('general.delete').' '.htmlspecialchars($depreciation->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
-
-            $rows[] = array(
-                'id'            => $depreciation->id,
-                'name'          => e($depreciation->name),
-                'months'        => e($depreciation->months),
-                'actions'       => $actions
-            );
-        }
-
-        $data = array('total' => $depreciationsCount, 'rows' => $rows);
-
-        return $data;
-
-    }
 }
--- a/app/Http/Controllers/GroupsController.php
+++ b/app/Http/Controllers/GroupsController.php
@@ -26,12 +26,12 @@ class GroupsController extends Controller
    * @author [A. Gianotto] [<snipe@snipe.net]
    * @see GroupsController::getDatatable() method that generates the JSON response
    * @since [v1.0]
-    * @return View
-    */
-    public function getIndex()
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function index()
    {
        // Show the page
-        return View::make('groups/index', compact('groups'));
+        return view('groups/index', compact('groups'));
    }

    /**
@@ -40,9 +40,9 @@ class GroupsController extends Controller
    * @author [A. Gianotto] [<snipe@snipe.net]
    * @see GroupsController::postCreate()
    * @since [v1.0]
-    * @return View
-    */
-    public function getCreate()
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function create()
    {
        $group = new Group;
        // Get all the available permissions
@@ -51,7 +51,7 @@ class GroupsController extends Controller
        $selectedPermissions = Input::old('permissions', $groupPermissions);

        // Show the page
-        return View::make('groups/edit', compact('permissions', 'selectedPermissions', 'groupPermissions'))->with('group', $group);
+        return view('groups/edit', compact('permissions', 'selectedPermissions', 'groupPermissions'))->with('group', $group);
    }

    /**
@@ -60,9 +60,9 @@ class GroupsController extends Controller
    * @author [A. Gianotto] [<snipe@snipe.net]
    * @see GroupsController::getCreate()
    * @since [v1.0]
-    * @return Redirect
-    */
-    public function postCreate()
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function store()
    {
        // create a new group instance
        $group = new Group();
@@ -70,12 +70,9 @@ class GroupsController extends Controller
        $group->permissions = json_encode(Input::get('permission'));

        if ($group->save()) {
-            return redirect()->to("admin/groups")->with('success', trans('admin/groups/message.success.create'));
+            return redirect()->route("groups.index")->with('success', trans('admin/groups/message.success.create'));
        }
-
-        return redirect()->back()->withInput()->withErrors($group->getErrors());
-
-
+        return redirect(route('groups.create'))->withInput()->withErrors($group->getErrors());
    }

    /**
@@ -85,15 +82,15 @@ class GroupsController extends Controller
    * @see GroupsController::postEdit()
    * @param int $id
    * @since [v1.0]
-    * @return View
-    */
-    public function getEdit($id = null)
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function edit($id = null)
    {
        $group = Group::find($id);
        $permissions = config('permissions');
        $groupPermissions = $group->decodePermissions();
        $selected_array = Helper::selectedPermissionsArray($permissions, $groupPermissions);
-        return View::make('groups/edit', compact('group', 'permissions', 'selected_array', 'groupPermissions'));
+        return view('groups.edit', compact('group', 'permissions', 'selected_array', 'groupPermissions'));
    }

    /**
@@ -103,30 +100,24 @@ class GroupsController extends Controller
    * @see GroupsController::getEdit()
    * @param int $id
    * @since [v1.0]
-    * @return Redirect
-    */
-    public function postEdit($id = null)
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function update($id = null)
    {
        $permissions = config('permissions');
        if (!$group = Group::find($id)) {
            return redirect()->route('groups')->with('error', trans('admin/groups/message.group_not_found', compact('id')));
-
        }
        $group->name = e(Input::get('name'));
        $group->permissions = json_encode(Input::get('permission'));

-
        if (!config('app.lock_passwords')) {
-
            if ($group->save()) {
-                return redirect()->to("admin/groups")->with('success', trans('admin/groups/message.success.update'));
+                return redirect()->route('groups.index')->with('success', trans('admin/groups/message.success.update'));
            }
            return redirect()->back()->withInput()->withErrors($group->getErrors());
-
-        } else {
-            return redirect()->route('update/group', $id)->withInput()->with('error', 'Denied! Editing groups is not allowed in the demo.');
        }
-
+        return redirect()->route('groups.index')->with('error', trans('general.feature_disabled'));
    }

    /**
@@ -136,103 +127,19 @@ class GroupsController extends Controller
    * @see GroupsController::getEdit()
    * @param int $id
    * @since [v1.0]
-    * @return Redirect
-    */
-    public function getDelete($id = null)
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy($id = null)
    {
        if (!config('app.lock_passwords')) {
-            try {
-                // Get group information
-                $group = Group::find($id);
-                $group->delete();
-
-                // Redirect to the group management page
-                return redirect()->route('groups')->with('success', trans('admin/groups/message.success.delete'));
-            } catch (GroupNotFoundException $e) {
-                // Redirect to the group management page
+            if (!$group = Group::find($id)) {
                return redirect()->route('groups')->with('error', trans('admin/groups/message.group_not_found', compact('id')));
            }
-        } else {
-            return redirect()->route('groups')->with('error', trans('general.feature_disabled'));
+            $group->delete();
+            // Redirect to the group management page
+            return redirect()->route('groups.index')->with('success', trans('admin/groups/message.success.delete'));
        }
+        return redirect()->route('groups.index')->with('error', trans('general.feature_disabled'));
    }

-
-    /**
-    * Generates the JSON used to display the User Group listing.
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @since [v2.0]
-    * @return String JSON
-    */
-    public function getDatatable()
-    {
-
-        if (Input::has('offset')) {
-            $offset = e(Input::get('offset'));
-        } else {
-            $offset = 0;
-        }
-
-        if (Input::has('limit')) {
-            $limit = e(Input::get('limit'));
-        } else {
-            $limit = 50;
-        }
-
-        if (Input::get('sort')=='name') {
-            $sort = 'first_name';
-        } else {
-            $sort = e(Input::get('sort'));
-        }
-
-        // Grab all the groups
-        $groups = Group::with('users')->orderBy('name', 'ASC');
-        //$users = Company::scopeCompanyables($users);
-
-        if (Input::has('search')) {
-            $groups = $users->TextSearch(e(Input::get('search')));
-        }
-
-         $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
-
-        $allowed_columns =
-         [
-           'name','created_at'
-         ];
-
-        $sort = in_array($sort, $allowed_columns) ? $sort : 'name';
-        $groups = $groups->orderBy($sort, $order);
-
-        $groupsCount = $groups->count();
-        $groups = $groups->skip($offset)->take($limit)->get();
-        $rows = array();
-
-        foreach ($groups as $group) {
-            $group_names = '';
-            $inout = '';
-            $actions = '<nobr>';
-
-            $actions .= '<a href="' . route('update/group', $group->id) . '" class="btn btn-warning btn-sm"><i class="fa fa-pencil icon-white"></i></a> ';
-
-            if (!config('app.lock_passwords')) {
-                  $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/group', $group->id) . '" data-content="'.trans('admin/groups/message.delete.confirm').'" data-title="Delete ' . htmlspecialchars($group->name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a> ';
-            } else {
-                $actions .= ' <span class="btn delete-asset btn-danger btn-sm disabled"><i class="fa fa-trash icon-white"></i></span>';
-            }
-
-            $actions .= '</nobr>';
-
-            $rows[] = array(
-                'id'         => $group->id,
-                'name'        => $group->name,
-                'users'         => $group->users->count(),
-                'created_at'        => $group->created_at->format('Y-m-d'),
-                'actions'       => ($actions) ? $actions : '',
-            );
-        }
-
-        $data = array('total'=>$groupsCount, 'rows'=>$rows);
-        return $data;
-    }
 }
--- a/app/Http/Controllers/ImportsController.php
+++ b/app/Http/Controllers/ImportsController.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Transformers\ImportsTransformer;
+use App\Models\Import;
+use Illuminate\Http\Request;
+
+class ImportsController extends Controller
+{
+    public function index()
+    {
+        $this->authorize('create', Asset::class);
+        $imports = Import::latest()->get();
+        $imports = (new ImportsTransformer)->transformImports($imports);
+        return view('importer/import')->with('imports', $imports);
+    }
+}
--- a/app/Http/Controllers/LicensesController.php
+++ b/app/Http/Controllers/LicensesController.php
--- a/app/Http/Controllers/LocationsController.php
+++ b/app/Http/Controllers/LocationsController.php
@@ -1,9 +1,11 @@
 <?php
 namespace App\Http\Controllers;

+use App\Helpers\Helper;
 use Input;
 use Lang;
 use App\Models\Location;
+use phpDocumentor\Reflection\Types\Array_;
 use Redirect;
 use App\Models\Setting;
 use App\Models\User;
@@ -31,15 +33,15 @@ class LocationsController extends Controller
    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @see LocationsController::getDatatable() method that generates the JSON response
    * @since [v1.0]
-    * @return View
-    */
-    public function getIndex()
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function index()
    {
        // Grab all the locations
        $locations = Location::orderBy('created_at', 'DESC')->with('parent', 'assets', 'assignedassets')->get();

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


@@ -49,9 +51,9 @@ class LocationsController extends Controller
    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @see LocationsController::postCreate() method that validates and stores the data
    * @since [v1.0]
-    * @return View
-    */
-    public function getCreate()
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function create()
    {
        $locations = Location::orderBy('name', 'ASC')->get();

@@ -59,9 +61,9 @@ class LocationsController extends Controller
        $location_options = Location::flattenLocationsArray($location_options_array);
        $location_options = array('' => 'Top Level') + $location_options;

-        return View::make('locations/edit')
-        ->with('location_options', $location_options)
-        ->with('item', new Location);
+        return view('locations/edit')
+            ->with('location_options', $location_options)
+            ->with('item', new Location);
    }


@@ -72,38 +74,26 @@ class LocationsController extends Controller
    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @see LocationsController::getCreate() method that makes the form
    * @since [v1.0]
-    * @return Redirect
-    */
-    public function postCreate()
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function store()
    {
-
-    // create a new location instance
        $location = new Location();
-
-
-    // Save the location data
-        $location->name             = e(Input::get('name'));
-        if (Input::get('parent_id')=='') {
-            $location->parent_id        = null;
-        } else {
-            $location->parent_id        = e(Input::get('parent_id'));
-        }
-        $location->currency             = e(Input::get('currency', '$'));
-        $location->address          = e(Input::get('address'));
-        $location->address2             = e(Input::get('address2'));
-        $location->city             = e(Input::get('city'));
-        $location->state            = e(Input::get('state'));
-        $location->country          = e(Input::get('country'));
-        $location->zip              = e(Input::get('zip'));
-        $location->user_id          = Auth::user()->id;
+        $location->name             = Input::get('name');
+        $location->parent_id        = Input::get('parent_id', null);
+        $location->currency         = Input::get('currency', '$');
+        $location->address          = Input::get('address');
+        $location->address2         = Input::get('address2');
+        $location->city             = Input::get('city');
+        $location->state            = Input::get('state');
+        $location->country          = Input::get('country');
+        $location->zip              = Input::get('zip');
+        $location->user_id          = Auth::id();

        if ($location->save()) {
-            // Redirect to the new location  page
-            return redirect()->to("admin/settings/locations")->with('success', trans('admin/locations/message.create.success'));
+            return redirect()->route("locations.index")->with('success', trans('admin/locations/message.create.success'));
        }
-
        return redirect()->back()->withInput()->withErrors($location->getErrors());
-
    }

    /**
@@ -115,35 +105,30 @@ class LocationsController extends Controller
    * @since [v1.0]
    * @return String JSON
    */
-    public function store()
+    public function apiStore()
    {
-
        $new['currency']=Setting::first()->default_currency;

        // create a new location instance
        $location = new Location();

        // Save the location data
-        $location->name               = e(Input::get('name'));
+        $location->name               = Input::get('name');
        $location->currency           =  Setting::first()->default_currency; //e(Input::get('currency'));
        $location->address            = ''; //e(Input::get('address'));
        // $location->address2			= e(Input::get('address2'));
-        $location->city               = e(Input::get('city'));
+        $location->city               = Input::get('city');
        $location->state          = '';//e(Input::get('state'));
-        $location->country            = e(Input::get('country'));
+        $location->country            = Input::get('country');
        // $location->zip    			= e(Input::get('zip'));
-        $location->user_id          = Auth::user()->id;
+        $location->user_id          = Auth::id();

        // Was the location created?
        if ($location->save()) {
            return JsonResponse::create($location);
-
        }
-
        // failure
-        $errors = $location->errors();
        return JsonResponse::create(["error" => "Failed validation: ".print_r($location->getErrors(), true)], 500);
-
    }


@@ -154,9 +139,9 @@ class LocationsController extends Controller
    * @see LocationsController::postCreate() method that validates and stores
    * @param int $locationId
    * @since [v1.0]
-    * @return View
-    */
-    public function getEdit($locationId = null)
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function edit($locationId = null)
    {
        // Check if the location exists
        if (is_null($item = Location::find($locationId))) {
@@ -169,7 +154,7 @@ class LocationsController extends Controller
        $location_options = Location::flattenLocationsArray($location_options_array);
        $location_options = array('' => 'Top Level') + $location_options;

-        return View::make('locations/edit', compact('item'))->with('location_options', $location_options);
+        return view('locations/edit', compact('item'))->with('location_options', $location_options);
    }


@@ -180,40 +165,34 @@ class LocationsController extends Controller
    * @see LocationsController::getEdit() method that makes the form view
    * @param int $locationId
    * @since [v1.0]
-    * @return Redirect
-    */
-    public function postEdit($locationId = null)
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function update($locationId = null)
    {
        // Check if the location exists
        if (is_null($location = Location::find($locationId))) {
-            // Redirect to the blogs management page
            return redirect()->to('admin/settings/locations')->with('error', trans('admin/locations/message.does_not_exist'));
        }

        // Update the location data
-        $location->name         = e(Input::get('name'));
-        if (Input::get('parent_id')=='') {
-            $location->parent_id        = null;
-        } else {
-            $location->parent_id        = e(Input::get('parent_id', ''));
-        }
-        $location->currency             = e(Input::get('currency', '$'));
-        $location->address          = e(Input::get('address'));
-        $location->address2             = e(Input::get('address2'));
-        $location->city             = e(Input::get('city'));
-        $location->state            = e(Input::get('state'));
-        $location->country      = e(Input::get('country'));
-        $location->zip            = e(Input::get('zip'));
+        $location->name         = Input::get('name');
+        $location->parent_id    = Input::get('parent_id', null);
+        $location->currency     = Input::get('currency', '$');
+        $location->address      = Input::get('address');
+        $location->address2     = Input::get('address2');
+        $location->city         = Input::get('city');
+        $location->state        = Input::get('state');
+        $location->country      = Input::get('country');
+        $location->zip          = Input::get('zip');
+        $location->ldap_ou      = Input::get('ldap_ou');

-        // Was the asset created?
+        // Was the location updated?
        if ($location->save()) {
          // Redirect to the saved location page
-            return redirect()->to("admin/settings/locations/")->with('success', trans('admin/locations/message.update.success'));
+            return redirect()->route("locations.index")->with('success', trans('admin/locations/message.update.success'));
        }
-
        // Redirect to the location management page
        return redirect()->back()->withInput()->withInput()->withErrors($location->getErrors());
-
    }

    /**
@@ -222,32 +201,29 @@ class LocationsController extends Controller
    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @param int $locationId
    * @since [v1.0]
-    * @return Redirect
-    */
-    public function getDelete($locationId)
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy($locationId)
    {
        // Check if the location exists
        if (is_null($location = Location::find($locationId))) {
            // Redirect to the blogs management page
-            return redirect()->to('admin/settings/locations')->with('error', trans('admin/locations/message.not_found'));
+            return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.not_found'));
        }


        if ($location->users->count() > 0) {
-            return redirect()->to('admin/settings/locations')->with('error', trans('admin/locations/message.assoc_users'));
+            return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.assoc_users'));
        } elseif ($location->childLocations->count() > 0) {
-            return redirect()->to('admin/settings/locations')->with('error', trans('admin/locations/message.assoc_child_loc'));
+            return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.assoc_child_loc'));
        } elseif ($location->assets->count() > 0) {
-            return redirect()->to('admin/settings/locations')->with('error', trans('admin/locations/message.assoc_assets'));
+            return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.assoc_assets'));
        } elseif ($location->assignedassets->count() > 0) {
-            return redirect()->to('admin/settings/locations')->with('error', trans('admin/locations/message.assoc_assets'));
+            return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.assoc_assets'));
        } else {
            $location->delete();
-            return redirect()->to('admin/settings/locations')->with('success', trans('admin/locations/message.delete.success'));
+            return redirect()->to(route('locations.index'))->with('success', trans('admin/locations/message.delete.success'));
        }
-
-
-
    }


@@ -260,114 +236,34 @@ class LocationsController extends Controller
    * @see LocationsController::getDataViewAssets() method that returns JSON for location assets
    * @param int $locationId
    * @since [v1.0]
-    * @return View
-    */
-    public function getView($locationId = null)
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function show($locationId = null)
    {
        $location = Location::find($locationId);

        if (isset($location->id)) {
-                return View::make('locations/view', compact('location'));
-        } else {
-            // Prepare the error message
-            $error = trans('admin/locations/message.does_not_exist', compact('id'));
-
-            // Redirect to the user management page
-            return redirect()->route('locations')->with('error', $error);
+            return view('locations/view', compact('location'));
        }
+        // Prepare the error message
+        $error = trans('admin/locations/message.does_not_exist', compact('id'));

-
+        // Redirect to the user management page
+        return redirect()->route('locations.index')->with('error', $error);
    }


    /**
-    * Returns the JSON response to populate the bootstrap tables on the locationa view.
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @see LocationsController::getIndex() method that returns JSON for location index
-    * @since [v1.0]
-    * @return View
-    */
-    public function getDatatable()
-    {
-        $locations = Location::select(array('locations.id','locations.name','locations.address','locations.address2','locations.city','locations.state','locations.zip','locations.country','locations.parent_id','locations.currency'))->with('assets');
-
-
-        if (Input::has('search')) {
-            $locations = $locations->TextSearch(e(Input::get('search')));
-        }
-
-        if (Input::has('offset')) {
-            $offset = e(Input::get('offset'));
-        } else {
-            $offset = 0;
-        }
-
-        if (Input::has('limit')) {
-            $limit = e(Input::get('limit'));
-        } else {
-            $limit = 50;
-        }
-
-        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
-
-
-
-        switch (Input::get('sort')) {
-            case 'parent':
-                $locations = $locations->OrderParent($order);
-                break;
-            default:
-                $allowed_columns = ['id','name','address','city','state','country','currency','zip'];
-
-                $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
-                $locations = $locations->orderBy($sort, $order);
-                break;
-        }
-
-
-        $locationsCount = $locations->count();
-        $locations = $locations->skip($offset)->take($limit)->get();
-
-        $rows = array();
-
-        foreach ($locations as $location) {
-            $actions = '<nobr><a href="'.route('update/location', $location->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/location', $location->id).'" data-content="'.trans('admin/locations/message.delete.confirm').'" data-title="'.trans('general.delete').' '.htmlspecialchars($location->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></nobr>';
-
-            $rows[] = array(
-                'id'            => $location->id,
-                'name'          => (string)link_to('admin/settings/locations/'.$location->id.'/view', e($location->name)),
-                'parent'        => ($location->parent) ? e($location->parent->name) : '',
-              //  'assets'        => ($location->assets->count() + $location->assignedassets->count()),
-                'assets_default' => $location->assignedassets->count(),
-                'assets_checkedout' => $location->assets->count(),
-                'address'       => ($location->address) ? e($location->address): '',
-                'city'          => e($location->city),
-                'state'         => e($location->state),
-                'zip'           => e($location->zip),
-                'country'       => e($location->country),
-                'currency'      => e($location->currency),
-                'actions'       => $actions
-            );
-        }
-
-        $data = array('total' => $locationsCount, 'rows' => $rows);
-
-        return $data;
-
-    }
-
-
-    /**
-    * Returns a JSON response that contains the users association with the
-    * selected location, to be used by the location detail view.
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @see LocationsController::getView() method that creates the display view
-    * @param int $locationId
-    * @since [v1.8]
-    * @return View
-    */
+     * Returns a JSON response that contains the users association with the
+     * selected location, to be used by the location detail view.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @see LocationsController::getView() method that creates the display view
+     * @param $locationID
+     * @return array
+     * @internal param int $locationId
+     * @since [v1.8]
+     */
    public function getDataViewUsers($locationID)
    {
        $location = Location::find($locationID);
@@ -382,7 +278,7 @@ class LocationsController extends Controller

        foreach ($users as $user) {
            $rows[] = array(
-              'name' => (string)link_to('/admin/users/'.$user->id.'/view', e($user->fullName()))
+              'name' => (string)link_to_route('users.show', e($user->present()->fullName()), ['user'=>$user->id])
              );
        }

@@ -402,8 +298,8 @@ class LocationsController extends Controller
    * @see LocationsController::getView() method that creates the display view
    * @param int $locationID
    * @since [v1.8]
-    * @return View
-    */
+    * @return array
+     */
    public function getDataViewAssets($locationID)
    {
        $location = Location::find($locationID)->load('assignedassets.model');
@@ -418,12 +314,12 @@ class LocationsController extends Controller
        $rows = array();

        foreach ($assets as $asset) {
-            $rows[] = array(
-            'name' => (string)link_to(config('app.url').'/hardware/'.$asset->id.'/view', e($asset->showAssetName())),
-            'asset_tag' => e($asset->asset_tag),
-            'serial' => e($asset->serial),
-            'model' => e($asset->model->name),
-            );
+            $rows[] = [
+                'name' => (string)link_to_route('hardware.show', e($asset->present()->name()), ['hardware' => $asset->id]),
+                'asset_tag' => e($asset->asset_tag),
+                'serial' => e($asset->serial),
+                'model' => e($asset->model->name),
+            ];
        }

        $data = array('total' => $assets->count(), 'rows' => $rows);
--- a/app/Http/Controllers/ManufacturersController.php
+++ b/app/Http/Controllers/ManufacturersController.php
@@ -1,16 +1,18 @@
 <?php
 namespace App\Http\Controllers;

-use App\Models\Company;
+use App\Helpers\Helper;
+use App\Models\CustomField;
 use App\Models\Manufacturer;
-use App\Models\Setting;
 use Auth;
+use Exception;
 use Gate;
 use Input;
 use Lang;
 use Redirect;
 use Str;
 use View;
+use Illuminate\Http\Request;

 /**
 * This controller handles all actions related to Manufacturers for
@@ -25,14 +27,13 @@ class ManufacturersController extends Controller
    * the content for the manufacturers listing, which is generated in getDatatable.
    *
    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @see ManufacturersController::getDatatable() method that generates the JSON response
+    * @see Api\ManufacturersController::index() method that generates the JSON response
    * @since [v1.0]
-    * @return View
-    */
-    public function getIndex()
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function index()
    {
-        // Show the page
-        return View::make('manufacturers/index', compact('manufacturers'));
+        return view('manufacturers/index', compact('manufacturers'));
    }


@@ -40,89 +41,93 @@ class ManufacturersController extends Controller
    * Returns a view that displays a form to create a new manufacturer.
    *
    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @see ManufacturersController::postCreate()
+    * @see ManufacturersController::store()
    * @since [v1.0]
-    * @return View
-    */
-    public function getCreate()
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function create()
    {
-        return View::make('manufacturers/edit')->with('item', new Manufacturer);
+        return view('manufacturers/edit')->with('item', new Manufacturer);
    }


    /**
-    * Validates and stores the data for a new manufacturer.
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @see ManufacturersController::postCreate()
-    * @since [v1.0]
-    * @return Redirect
-    */
-    public function postCreate()
+     * Validates and stores the data for a new manufacturer.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @see ManufacturersController::create()
+     * @since [v1.0]
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function store(Request $request)
    {
+
        $manufacturer = new Manufacturer;
-        $manufacturer->name            = e(Input::get('name'));
+        $manufacturer->name            = $request->input('name');
        $manufacturer->user_id          = Auth::user()->id;
+        $manufacturer->url     = $request->input('url');
+        $manufacturer->support_url     = $request->input('support_url');
+        $manufacturer->support_phone    = $request->input('support_phone');
+        $manufacturer->support_email    = $request->input('support_email');
+
+

        if ($manufacturer->save()) {
-            return redirect()->to("admin/settings/manufacturers")->with('success', trans('admin/manufacturers/message.create.success'));
+            return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.create.success'));
        }
-
        return redirect()->back()->withInput()->withErrors($manufacturer->getErrors());
-
    }

    /**
    * Returns a view that displays a form to edit a manufacturer.
    *
    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @see ManufacturersController::postEdit()
+    * @see ManufacturersController::update()
    * @param int $manufacturerId
    * @since [v1.0]
-    * @return View
-    */
-    public function getEdit($manufacturerId = null)
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function edit($id = null)
    {
        // Check if the manufacturer exists
-        if (is_null($item = Manufacturer::find($manufacturerId))) {
-            // Redirect to the manufacturer  page
-            return redirect()->to('admin/settings/manufacturers')->with('error', trans('admin/manufacturers/message.does_not_exist'));
+        if (is_null($item = Manufacturer::find($id))) {
+            return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.does_not_exist'));
        }
-
        // Show the page
-        return View::make('manufacturers/edit', compact('item'));
+        return view('manufacturers/edit', compact('item'));
    }


    /**
-    * Validates and stores the updated manufacturer data.
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @see ManufacturersController::getEdit()
-    * @param int $manufacturerId
-    * @since [v1.0]
-    * @return View
-    */
-    public function postEdit($manufacturerId = null)
+     * Validates and stores the updated manufacturer data.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @see ManufacturersController::getEdit()
+     * @param Request $request
+     * @param int $manufacturerId
+     * @return \Illuminate\Http\RedirectResponse
+     * @since [v1.0]
+     */
+    public function update(Request $request, $manufacturerId = null)
    {
        // Check if the manufacturer exists
        if (is_null($manufacturer = Manufacturer::find($manufacturerId))) {
            // Redirect to the manufacturer  page
-            return redirect()->to('admin/settings/manufacturers')->with('error', trans('admin/manufacturers/message.does_not_exist'));
+            return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.does_not_exist'));
        }

        // Save the  data
-        $manufacturer->name     = e(Input::get('name'));
+        $manufacturer->name     = $request->input('name');
+        $manufacturer->url     = $request->input('url');
+        $manufacturer->support_url     = $request->input('support_url');
+        $manufacturer->support_phone    = $request->input('support_phone');
+        $manufacturer->support_email    = $request->input('support_email');

-        // Was it created?
        if ($manufacturer->save()) {
-            // Redirect to the new manufacturer page
-            return redirect()->to("admin/settings/manufacturers")->with('success', trans('admin/manufacturers/message.update.success'));
+            return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.update.success'));
        }
-
        return redirect()->back()->withInput()->withErrors($manufacturer->getErrors());
-
-
    }

    /**
@@ -131,33 +136,26 @@ class ManufacturersController extends Controller
    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @param int $manufacturerId
    * @since [v1.0]
-    * @return View
-    */
-    public function getDelete($manufacturerId)
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy($manufacturerId)
    {
        // Check if the manufacturer exists
        if (is_null($manufacturer = Manufacturer::find($manufacturerId))) {
            // Redirect to the manufacturers page
-            return redirect()->to('admin/settings/manufacturers')->with('error', trans('admin/manufacturers/message.not_found'));
+            return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.not_found'));
        }

        if ($manufacturer->has_models() > 0) {
-
            // Redirect to the asset management page
-            return redirect()->to('admin/settings/manufacturers')->with('error', trans('admin/manufacturers/message.assoc_users'));
-        } else {
-
-            // Delete the manufacturer
-            $manufacturer->delete();
-
-            // Redirect to the manufacturers management page
-            return redirect()->to('admin/settings/manufacturers')->with('success', trans('admin/manufacturers/message.delete.success'));
+            return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.assoc_users'));
        }
-
+        // Delete the manufacturer
+        $manufacturer->delete();
+        // Redirect to the manufacturers management page
+        return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.delete.success'));
    }

-
-
    /**
    * Returns a view that invokes the ajax tables which actually contains
    * the content for the manufacturers detail listing, which is generated in getDatatable.
@@ -167,189 +165,88 @@ class ManufacturersController extends Controller
    * @see ManufacturersController::getDataView()
    * @param int $manufacturerId
    * @since [v1.0]
-    * @return View
-    */
-    public function getView($manufacturerId = null)
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function show($manufacturerId = null)
    {
        $manufacturer = Manufacturer::find($manufacturerId);

        if (isset($manufacturer->id)) {
-                return View::make('manufacturers/view', compact('manufacturer'));
-        } else {
-            // Prepare the error message
-            $error = trans('admin/manufacturers/message.does_not_exist', compact('id'));
-
-            // Redirect to the user management page
-            return redirect()->route('manufacturers')->with('error', $error);
+            return view('manufacturers/view', compact('manufacturer'));
        }
-
-
+        // Prepare the error message
+        $error = trans('admin/manufacturers/message.does_not_exist', compact('id'));
+        // Redirect to the user management page
+        return redirect()->route('manufacturers')->with('error', $error);
    }

+   
    /**
-    * Generates the JSON used to display the manufacturer listings.
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @see ManufacturersController::getIndex()
-    * @since [v1.0]
-    * @return String JSON
-    */
-    public function getDatatable()
-    {
-        $manufacturers = Manufacturer::select(array('id','name'))->with('assets')
-        ->whereNull('deleted_at');
-
-        if (Input::has('search')) {
-            $manufacturers = $manufacturers->TextSearch(e(Input::get('search')));
-        }
-
-        if (Input::has('offset')) {
-            $offset = e(Input::get('offset'));
-        } else {
-            $offset = 0;
-        }
-
-        if (Input::has('limit')) {
-            $limit = e(Input::get('limit'));
-        } else {
-            $limit = 50;
-        }
-
-        $allowed_columns = ['id','name'];
-        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
-
-        $manufacturers->orderBy($sort, $order);
-
-        $manufacturersCount = $manufacturers->count();
-        $manufacturers = $manufacturers->skip($offset)->take($limit)->get();
-
-        $rows = array();
-
-        foreach ($manufacturers as $manufacturer) {
-            $actions = '<a href="'.route('update/manufacturer', $manufacturer->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/manufacturer', $manufacturer->id).'" data-content="'.trans('admin/manufacturers/message.delete.confirm').'" data-title="'.trans('general.delete').' '.htmlspecialchars($manufacturer->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
-
-            $rows[] = array(
-                'id'              => $manufacturer->id,
-                'name'          => (string)link_to('admin/settings/manufacturers/'.$manufacturer->id.'/view', e($manufacturer->name)),
-                'assets'              => $manufacturer->assets->count(),
-                'actions'       => $actions
-            );
-        }
-
-        $data = array('total' => $manufacturersCount, 'rows' => $rows);
-
-        return $data;
-
-    }
-
-
-    /**
-    * Generates the JSON used to display the manufacturer detail.
-    * This JSON returns data on all of the assets with the specified
-    * manufacturer ID number.
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @see ManufacturersController::getView()
-    * @param int $manufacturerId
-    * @since [v1.0]
-    * @return String JSON
-    */
-    public function getDataView($manufacturerId, $itemtype = null)
+     * Generates the JSON used to display the manufacturer detail.
+     * This JSON returns data on all of the assets with the specified
+     * manufacturer ID number.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @see ManufacturersController::getView()
+     * @param int $manufacturerId
+     * @param string $itemType
+     * @param Request $request
+     * @return String JSON* @since [v1.0]
+     */
+    public function getDataView($manufacturerId, $itemType = null, Request $request)
    {
        $manufacturer = Manufacturer::find($manufacturerId);

-        switch ($itemtype) {
+        switch ($itemType) {
            case "assets":
-                return $this->getDataAssetsView($manufacturer);
+                return $this->getDataAssetsView($manufacturer, $request);
            case "licenses":
-                return $this->getDataLicensesView($manufacturer);
+                return $this->getDataLicensesView($manufacturer, $request);
            case "accessories":
-                return $this->getDataAccessoriesView($manufacturer);
+                return $this->getDataAccessoriesView($manufacturer, $request);
            case "consumables":
-                return $this->getDataConsumablesView($manufacturer);
+                return $this->getDataConsumablesView($manufacturer, $request);
        }

-        throw new Exception("We shouldn't be here");
+        return "We shouldn't be here";

    }

-    protected function getDataAssetsView(Manufacturer $manufacturer)
+    protected function getDataAssetsView(Manufacturer $manufacturer, Request $request)
    {
-        $manufacturer = $manufacturer->load('assets.model', 'assets.assigneduser', 'assets.assetstatus', 'assets.company');
-        $manufacturer_assets = $manufacturer->assets;
+        $manufacturer = $manufacturer->load('assets.model', 'assets.assignedTo', 'assets.assetstatus', 'assets.company');
+        $manufacturer_assets = $manufacturer->assets();

-        if (Input::has('search')) {
-            $manufacturer_assets = $manufacturer_assets->TextSearch(e(Input::get('search')));
+        if ($request->has('search')) {
+            $manufacturer_assets = $manufacturer_assets->TextSearch(e($request->input('search')));
        }

-        if (Input::has('offset')) {
-            $offset = e(Input::get('offset'));
-        } else {
-            $offset = 0;
-        }
+        $offset = request('offset', 0);
+        $limit = request('limit', 50);

-        if (Input::has('limit')) {
-            $limit = e(Input::get('limit'));
-        } else {
-            $limit = 50;
-        }
-
-        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';

        $allowed_columns = ['id','name','serial','asset_tag'];
-        $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
+        $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) {
-
-            $actions = '';
-            if ($asset->deleted_at=='') {
-                $actions = '<div style=" white-space: nowrap;"><a href="'.route('clone/hardware', $asset->id).'" class="btn btn-info btn-sm" title="Clone asset"><i class="fa fa-files-o"></i></a> <a href="'.route('update/hardware', $asset->id).'" class="btn btn-warning btn-sm"><i class="fa fa-pencil icon-white"></i></a> <a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/hardware', $asset->id).'" data-content="'.trans('admin/hardware/message.delete.confirm').'" data-title="'.trans('general.delete').' '.htmlspecialchars($asset->asset_tag).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></div>';
-            } elseif ($asset->deleted_at!='') {
-                $actions = '<a href="'.route('restore/hardware', $asset->id).'" class="btn btn-warning btn-sm"><i class="fa fa-recycle icon-white"></i></a>';
-            }
-
-            if ($asset->availableForCheckout()) {
-                if (Gate::allows('assets.checkout')) {
-                    $inout = '<a href="'.route('checkout/hardware', $asset->id).'" class="btn btn-info btn-sm">'.trans('general.checkout').'</a>';
-                }
-            } else {
-                if (Gate::allows('assets.checkin')) {
-                    $inout = '<a href="'.route('checkin/hardware', $asset->id).'" class="btn btn-primary btn-sm">'.trans('general.checkin').'</a>';
-                }
-            }
-
-            $rows[] = array(
-                'id' => $asset->id,
-                'name' => (string)link_to('/hardware/'.$asset->id.'/view', e($asset->showAssetName())),
-                'model' => e($asset->model->name),
-                'asset_tag' => e($asset->asset_tag),
-                'serial' => e($asset->serial),
-                'assigned_to' => ($asset->assigneduser) ? (string)link_to('/admin/users/'.$asset->assigneduser->id.'/view', e($asset->assigneduser->fullName())): '',
-                'actions' => $actions,
-                // 'companyName' => e(Company::getName($asset)),
-                'companyName' => is_null($asset->company) ? '' : $asset->company->name
-                );
-
-            if (isset($inout)) {
-                $row['change'] = $inout;
-            }
+            $rows[] = $asset->present()->forDataTable($all_custom_fields);
        }

        $data = array('total' => $count, 'rows' => $rows);
        return $data;
    }

-    protected function getDataLicensesView(Manufacturer $manufacturer)
+    protected function getDataLicensesView(Manufacturer $manufacturer, Request $request)
    {
        $manufacturer = $manufacturer->load('licenses.company', 'licenses.manufacturer', 'licenses.licenseSeatsRelation');
        $licenses = $manufacturer->licenses;

-        if (Input::has('search')) {
-            $licenses = $licenses->TextSearch(Input::get('search'));
+        if ($request->has('search')) {
+            $licenses = $licenses->TextSearch($request->input('search'));
        }

        $licenseCount = $licenses->count();
@@ -357,46 +254,7 @@ class ManufacturersController extends Controller
        $rows = array();

        foreach ($licenses as $license) {
-            $actions = '<span style="white-space: nowrap;">';
-
-            if (Gate::allows('licenses.checkout')) {
-                $actions .= '<a href="' . route('freecheckout/license', $license->id)
-                . '" class="btn btn-primary btn-sm' . (($license->remaincount() > 0) ? '' : ' disabled') . '" style="margin-right:5px;">' . trans('general.checkout') . '</a> ';
-            }
-
-            if (Gate::allows('licenses.create')) {
-                $actions .= '<a href="' . route('clone/license', $license->id)
-                . '" class="btn btn-info btn-sm" style="margin-right:5px;" title="Clone asset"><i class="fa fa-files-o"></i></a>';
-            }
-            if (Gate::allows('licenses.edit')) {
-                $actions .= '<a href="' . route('update/license', $license->id)
-                . '" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a>';
-            }
-            if (Gate::allows('licenses.delete')) {
-                $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'
-                 . route('delete/license', $license->id)
-                 . '" data-content="' . trans('admin/licenses/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($license->name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
-            }
-            $actions .='</span>';
-
-            $rows[] = array(
-                'id'                => $license->id,
-                'name'              => (string) link_to('/admin/licenses/'.$license->id.'/view', $license->name),
-                'serial'            => (string) link_to('/admin/licenses/'.$license->id.'/view', mb_strimwidth($license->serial, 0, 50, "...")),
-                'totalSeats'        => $license->licenseSeatCount,
-                'remaining'         => $license->remaincount(),
-                'license_name'      => e($license->license_name),
-                'license_email'     => e($license->license_email),
-                'purchase_date'     => ($license->purchase_date) ? $license->purchase_date : '',
-                'expiration_date'   => ($license->expiration_date) ? $license->expiration_date : '',
-                'purchase_cost'     => ($license->purchase_cost) ? number_format($license->purchase_cost, 2) : '',
-                'purchase_order'    => ($license->purchase_order) ? e($license->purchase_order) : '',
-                'order_number'      => ($license->order_number) ? e($license->order_number) : '',
-                'notes'             => ($license->notes) ? e($license->notes) : '',
-                'actions'           => $actions,
-                'companyName'       => is_null($license->company) ? '' : e($license->company->name),
-                'manufacturer'      => $license->manufacturer ? (string) link_to('/admin/settings/manufacturers/'.$license->manufacturer_id.'/view', $license->manufacturer->name) : ''
-            );
+            $rows[] = $license->present()->forDataTable();
        }

        $data = array('total' => $licenseCount, 'rows' => $rows);
@@ -404,7 +262,7 @@ class ManufacturersController extends Controller
        return $data;
    }

-    public function getDataAccessoriesView(Manufacturer $manufacturer)
+    public function getDataAccessoriesView(Manufacturer $manufacturer, Request $request)
    {
        $manufacturer = $manufacturer->load(
            'accessories.location',
@@ -412,56 +270,22 @@ class ManufacturersController extends Controller
            'accessories.category',
            'accessories.manufacturer',
            'accessories.users'
-            );
-        $accessories = $manufacturer->accessories;
+        );
+        $accessories = $manufacturer->accessories();

-        if (Input::has('search')) {
-            $accessories = $accessories->TextSearch(e(Input::get('search')));
+        if ($request->has('search')) {
+            $accessories = $accessories->TextSearch(e($request->input('search')));
        }

-        if (Input::has('limit')) {
-            $limit = e(Input::get('limit'));
-        } else {
-            $limit = 50;
-        }
+        $offset = request('offset', 0);
+        $limit = request('limit', 50);

        $accessCount = $accessories->count();
-
+        $accessories = $accessories->skip($offset)->take($limit)->get();
        $rows = array();

        foreach ($accessories as $accessory) {
-
-            $actions = '<nobr>';
-            if (Gate::allows('accessories.checkout')) {
-                $actions .= '<a href="' . route('checkout/accessory',
-                        $accessory->id) . '" style="margin-right:5px;" class="btn btn-info btn-sm" ' . (($accessory->numRemaining() > 0) ? '' : ' disabled') . '>' . trans('general.checkout') . '</a>';
-            }
-            if (Gate::allows('accessories.edit')) {
-                $actions .= '<a href="' . route('update/accessory',
-                        $accessory->id) . '" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a>';
-            }
-            if (Gate::allows('accessories.delete')) {
-                $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/accessory',
-                        $accessory->id) . '" data-content="' . trans('admin/accessories/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($accessory->name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
-            }
-            $actions .= '</nobr>';
-            $company = $accessory->company;
-
-            $rows[] = array(
-            'name'          => '<a href="'.url('admin/accessories/'.$accessory->id).'/view">'. $accessory->name.'</a>',
-            'category'      => ($accessory->category) ? (string)link_to('admin/settings/categories/'.$accessory->category->id.'/view', $accessory->category->name) : '',
-            'qty'           => e($accessory->qty),
-            'order_number'  => e($accessory->order_number),
-            'min_amt'  => e($accessory->min_amt),
-            'location'      => ($accessory->location) ? e($accessory->location->name): '',
-            'purchase_date' => e($accessory->purchase_date),
-            'purchase_cost' => number_format($accessory->purchase_cost, 2),
-            'numRemaining'  => $accessory->numRemaining(),
-            'actions'       => $actions,
-            'companyName'   => is_null($company) ? '' : e($company->name),
-            'manufacturer'      => $accessory->manufacturer ? (string) link_to('/admin/settings/manufacturers/'.$accessory->manufacturer_id.'/view', $accessory->manufacturer->name) : ''
-
-            );
+            $rows[] = $accessory->present()->forDataTable();
        }

        $data = array('total'=>$accessCount, 'rows'=>$rows);
@@ -469,7 +293,7 @@ class ManufacturersController extends Controller
        return $data;
    }

-    public function getDataConsumablesView($manufacturer)
+    public function getDataConsumablesView($manufacturer, Request $request)
    {
        $manufacturer = $manufacturer->load(
            'consumables.location',
@@ -478,59 +302,22 @@ class ManufacturersController extends Controller
            'consumables.manufacturer',
            'consumables.users'
        );
-        $consumables = $manufacturer->consumables;
+        $consumables = $manufacturer->consumables();

-        if (Input::has('search')) {
-            $consumables = $consumables->TextSearch(e(Input::get('search')));
+        if ($request->has('search')) {
+            $consumables = $consumables->TextSearch(e($request->input('search')));
        }

-        if (Input::has('limit')) {
-            $limit = e(Input::get('limit'));
-        } else {
-            $limit = 50;
-        }
+        $offset = request('offset', 0);
+        $limit = request('limit', 50);
+

        $consumCount = $consumables->count();
-
+        $consumables = $consumables->skip($offset)->take($limit)->get();
        $rows = array();

        foreach ($consumables as $consumable) {
-            $actions = '<nobr>';
-            if (Gate::allows('consumables.checkout')) {
-                $actions .= '<a href="' . route('checkout/consumable',
-                        $consumable->id) . '" style="margin-right:5px;" class="btn btn-info btn-sm" ' . (($consumable->numRemaining() > 0) ? '' : ' disabled') . '>' . trans('general.checkout') . '</a>';
-            }
-
-            if (Gate::allows('consumables.edit')) {
-                $actions .= '<a href="' . route('update/consumable',
-                        $consumable->id) . '" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a>';
-            }
-            if (Gate::allows('consumables.delete')) {
-                $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/consumable',
-                        $consumable->id) . '" data-content="' . trans('admin/consumables/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($consumable->name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
-            }
-
-            $actions .='</nobr>';
-
-            $company = $consumable->company;
-
-            $rows[] = array(
-                'id'            => $consumable->id,
-                'name'          => (string)link_to('admin/consumables/'.$consumable->id.'/view', e($consumable->name)),
-                'location'      => ($consumable->location) ? e($consumable->location->name) : '',
-                'min_amt'       => e($consumable->min_amt),
-                'qty'           => e($consumable->qty),
-                'manufacturer'  => ($consumable->manufacturer) ? (string) link_to('/admin/settings/manufacturers/'.$consumable->manufacturer_id.'/view', $consumable->manufacturer->name): '',
-                'model_number'  => e($consumable->model_number),
-                'item_no'       => e($consumable->item_no),
-                'category'      => ($consumable->category) ? (string) link_to('/admin/settings/categories/'.$consumable->category_id.'/view', $consumable->category->name) : 'Missing category',
-                'order_number'  => e($consumable->order_number),
-                'purchase_date' => e($consumable->purchase_date),
-                'purchase_cost' => ($consumable->purchase_cost!='') ? number_format($consumable->purchase_cost, 2): '' ,
-                'numRemaining'  => $consumable->numRemaining(),
-                'actions'       => $actions,
-                'companyName'   => is_null($company) ? '' : e($company->name),
-            );
+            $rows[] = $consumable->present()->forDataTable();
        }

        $data = array('total' => $consumCount, 'rows' => $rows);
--- a/app/Http/Controllers/ModalController.php
+++ b/app/Http/Controllers/ModalController.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+use App\Helpers\Helper;
+
+class ModalController extends Controller
+{
+    function location() {
+        return view('modals.location');
+    }
+
+    function model() {
+        return view('modals.model')
+            ->with('manufacturer', Helper::manufacturerList())
+            ->with('category', Helper::categoryList('asset'));
+    }
+
+    function statuslabel() {
+        return view('modals.statuslabel')->with('statuslabel_types', Helper::statusTypeList());
+    }
+
+    function supplier() {
+        return view('modals.supplier');
+    }
+
+    function user() {
+        return view('modals.user');
+    }
+}
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -4,12 +4,13 @@ namespace App\Http\Controllers;
 use Image;
 use Input;
 use Redirect;
-use App\Models\Location;
 use View;
 use Auth;
 use App\Helpers\Helper;
 use App\Models\Setting;
 use Gate;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Hash;

 /**
 * This controller handles all actions related to User Profiles for
@@ -24,14 +25,13 @@ class ProfileController extends Controller
    *
    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @since [v1.0]
-    * @return View
-    */
+    * @return \Illuminate\Contracts\View\View
+     */
    public function getIndex()
    {
-        // Get the user information
        $user = Auth::user();
        $location_list = Helper::locationsList();
-        return View::make('account/profile', compact('user'))->with('location_list', $location_list);
+        return view('account/profile', compact('user'))->with('location_list', $location_list);
    }

    /**
@@ -39,25 +39,21 @@ class ProfileController extends Controller
    *
    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @since [v1.0]
-    * @return Redirect
-    */
+    * @return \Illuminate\Http\RedirectResponse
+     */
    public function postIndex()
    {

-      // Grab the user
        $user = Auth::user();
-
-      // Update the user information
-        $user->first_name = e(Input::get('first_name'));
-        $user->last_name  = e(Input::get('last_name'));
-        $user->website    = e(Input::get('website'));
-        $user->location_id    = e(Input::get('location_id'));
-        $user->gravatar   = e(Input::get('gravatar'));
-        $user->locale = e(Input::get('locale'));
-
+        $user->first_name = Input::get('first_name');
+        $user->last_name  = Input::get('last_name');
+        $user->website    = Input::get('website');
+        $user->location_id    = Input::get('location_id');
+        $user->gravatar   = Input::get('gravatar');
+        $user->locale = Input::get('locale');

        if ((Gate::allows('self.two_factor')) && ((Setting::getSettings()->two_factor_enabled=='1') && (!config('app.lock_passwords')))) {
-            $user->two_factor_optin = e(Input::get('two_factor_optin', '0'));
+            $user->two_factor_optin = Input::get('two_factor_optin', '0');
        }
        
        if (Input::file('avatar')) {
@@ -77,4 +73,75 @@ class ProfileController extends Controller
        }
        return redirect()->back()->withInput()->withErrors($user->getErrors());
    }
+
+
+    /**
+     * Returns a page with the API token generation interface.
+     *
+     * We created a controller method for this because closures aren't allowed
+     * in the routes file if you want to be able to cache the routes.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return View
+     */
+    public function api() {
+        return view('account/api');
+    }
+
+    /**
+     * User change email page.
+     *
+     * @return View
+     */
+    public function password()
+    {
+        $user = Auth::user();
+        return view('account/change-password', compact('user'));
+    }
+
+    /**
+     * Users change password form processing page.
+     *
+     * @return Redirect
+     */
+    public function passwordSave(Request $request)
+    {
+
+        if (config('app.lock_passwords')) {
+            return redirect()->route('account.password.index')->with('error', Lang::get('admin/users/table.lock_passwords'));
+        }
+
+        $user = Auth::user();
+        if ($user->ldap_import=='1') {
+            return redirect()->route('account.password.index')->with('error', Lang::get('admin/users/message.error.password_ldap'));
+        }
+
+        $rules = array(
+            'current_password'     => 'required',
+            'password'         => Setting::passwordComplexityRulesSaving('store'),
+            'password_confirm' => 'required|same:password',
+        );
+
+        $validator = \Validator::make($request->all(), $rules);
+        $validator->after(function($validator) use ($request, $user) {
+
+            if (!Hash::check($request->input('current_password'), $user->password)) {
+                $validator->errors()->add('current_password', trans('validation.hashed_pass'));
+            }
+            
+        });
+
+        if (!$validator->fails()) {
+            $user->password = Hash::make($request->input('password'));
+            $user->save();
+            return redirect()->route('account.password.index')->with('success', 'Password updated!');
+
+        }
+        return redirect()->back()->withInput()->withErrors($validator);
+
+
+    }
+
+
 }
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -6,21 +6,14 @@ use App\Models\Accessory;
 use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\AssetMaintenance;
-use App\Models\AssetModel;
-use App\Models\Company;
 use App\Models\CustomField;
 use App\Models\License;
-use App\Models\Location;
 use App\Models\Setting;
-use App\Models\User;
 use Carbon\Carbon;
-use Illuminate\Support\Facades\Lang;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Response;
 use Illuminate\Support\Facades\View;
 use Input;
 use League\Csv\Reader;
-use Redirect;
 use Symfony\Component\HttpFoundation\StreamedResponse;

 /**
@@ -42,8 +35,7 @@ class ReportsController extends Controller
    public function getAccessoryReport()
    {
        $accessories = Accessory::orderBy('created_at', 'DESC')->with('company')->get();
-
-        return View::make('reports/accessories', compact('accessories'));
+        return view('reports/accessories', compact('accessories'));
    }

    /**
@@ -98,7 +90,7 @@ class ReportsController extends Controller
    public function getAssetsReport()
    {
        $settings = \App\Models\Setting::first();
-        return View::make('reports/asset', compact('assets'))->with('settings', $settings);
+        return view('reports/asset', compact('assets'))->with('settings', $settings);
    }


@@ -117,11 +109,11 @@ class ReportsController extends Controller

        $customfields = CustomField::get();

-        $response = new StreamedResponse(function() use ($customfields) {
+        $response = new StreamedResponse(function () use ($customfields) {
            // Open output stream
            $handle = fopen('php://output', 'w');

-            Asset::with('assigneduser', 'assetloc','defaultLoc','assigneduser.userloc','model','supplier','assetstatus','model.manufacturer')->orderBy('created_at', 'DESC')->chunk(500, function($assets) use($handle, $customfields) {
+            Asset::with('assignedTo', 'assetLoc','defaultLoc','assignedTo','model','supplier','assetstatus','model.manufacturer')->orderBy('created_at', 'DESC')->chunk(500, function($assets) use($handle, $customfields) {
                $headers=[
                    trans('general.company'),
                    trans('admin/hardware/table.asset_tag'),
@@ -140,7 +132,7 @@ class ReportsController extends Controller
                    trans('admin/hardware/table.location'),
                    trans('general.notes'),
                ];
-                foreach($customfields as $field) {
+                foreach ($customfields as $field) {
                    $headers[]=$field->name;
                }
                fputcsv($handle, $headers);
@@ -160,13 +152,12 @@ class ReportsController extends Controller
                        ($asset->purchase_cost > 0) ? Helper::formatCurrencyOutput($asset->purchase_cost) : '',
                        ($asset->order_number) ? e($asset->order_number) : '',
                        ($asset->supplier) ? e($asset->supplier->name) : '',
-                        ($asset->assigneduser) ? e($asset->assigneduser->fullName()) : '',
+                        ($asset->assignedTo) ? e($asset->assignedTo->present()->name()) : '',
                        ($asset->last_checkout!='') ? e($asset->last_checkout) : '',
-                        ($asset->assigneduser && $asset->assigneduser->userloc!='') ?
-                            e($asset->assigneduser->userloc->name) : ( ($asset->defaultLoc!='') ? e($asset->defaultLoc->name) : ''),
+                        e($asset->assetLoc->present()->name()),
                        ($asset->notes) ? e($asset->notes) : '',
                    ];
-                    foreach($customfields as $field) {
+                    foreach ($customfields as $field) {
                        $values[]=$asset->{$field->db_column_name()};
                    }
                    fputcsv($handle, $values);
@@ -195,10 +186,10 @@ class ReportsController extends Controller
    {

        // Grab all the assets
-        $assets = Asset::with('model', 'assigneduser', 'assetstatus', 'defaultLoc', 'assetlog', 'company')
+        $assets = Asset::with('model', 'assignedTo', 'assetstatus', 'defaultLoc', 'assetlog', 'company')
                       ->orderBy('created_at', 'DESC')->get();

-        return View::make('reports/depreciation', compact('assets'));
+        return view('reports/depreciation', compact('assets'));
    }

    /**
@@ -213,7 +204,7 @@ class ReportsController extends Controller
    {

        // Grab all the assets
-        $assets = Asset::with('model', 'assigneduser', 'assetstatus', 'defaultLoc', 'assetlog')
+        $assets = Asset::with('model', 'assignedTo', 'assetstatus', 'defaultLoc', 'assetlog')
                       ->orderBy('created_at', 'DESC')->get();

        $csv = \League\Csv\Writer::createFromFileObject(new \SplTempFileObject());
@@ -244,15 +235,13 @@ class ReportsController extends Controller
            $row[] = e($asset->name);
            $row[] = e($asset->serial);

-            if ($asset->assigned_to > 0) {
-                $user  = User::find($asset->assigned_to);
-                $row[] = e($user->fullName());
+            if ($target = $asset->assignedTo) {
+                $row[] = e($target->present()->name());
            } else {
                $row[] = ''; // Empty string if unassigned
            }

-            if (( $asset->assigned_to > 0 ) && ( $asset->assigneduser->location_id > 0 )) {
-                $location = Location::find($asset->assigneduser->location_id);
+            if (( $asset->assigned_to > 0 ) && ( $location = $asset->assetLoc )) {
                if ($location->city) {
                    $row[] = e($location->city) . ', ' . e($location->state);
                } elseif ($location->name) {
@@ -291,131 +280,10 @@ class ReportsController extends Controller
    */
    public function getActivityReport()
    {
-        $log_actions = Actionlog::orderBy('created_at', 'DESC')
-                                ->with('item')
-                                ->orderBy('created_at', 'DESC')
-                                ->get();

-        return View::make('reports/activity', compact('log_actions'));
+        return view('reports/activity');
    }

-    /**
-     * Returns Activity Report JSON.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v1.0]
-     * @return View
-     */
-    public function getActivityReportDataTable()
-    {
-        $activitylogs = Company::scopeCompanyables(Actionlog::with('item', 'user', 'target'))->orderBy('created_at', 'DESC');
-
-        if (Input::has('search')) {
-            $activitylogs = $activitylogs->TextSearch(e(Input::get('search')));
-        }
-
-        if (Input::has('offset')) {
-            $offset = e(Input::get('offset'));
-        } else {
-            $offset = 0;
-        }
-
-        if (Input::has('limit')) {
-            $limit = e(Input::get('limit'));
-        } else {
-            $limit = 50;
-        }
-
-
-        $allowed_columns = ['created_at'];
-        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array(Input::get('sort'), $allowed_columns) ? e(Input::get('sort')) : 'created_at';
-
-
-        $activityCount = $activitylogs->count();
-        $activitylogs = $activitylogs->offset($offset)->limit($limit)->get();
-
-        $rows = array();
-        foreach ($activitylogs as $activity) {
-
-            if ($activity->itemType() == "asset") {
-                $activity_icons = '<i class="fa fa-barcode"></i>';
-            } elseif ($activity->itemType() == "accessory") {
-                $activity_icons = '<i class="fa fa-keyboard-o"></i>';
-            } elseif ($activity->itemType()=="consumable") {
-                $activity_icons = '<i class="fa fa-tint"></i>';
-            } elseif ($activity->itemType()=="license"){
-                $activity_icons = '<i class="fa fa-floppy-o"></i>';
-            } elseif ($activity->itemType()=="component") {
-                $activity_icons = '<i class="fa fa-hdd-o"></i>';
-            } else {
-                $activity_icons = '<i class="fa fa-paperclip"></i>';
-            }
-
-            if (($activity->item) && ($activity->itemType()=="asset")) {
-              $activity_item = '<a href="'.route('view/hardware', $activity->item_id).'">'.e($activity->item->asset_tag).' - '. e($activity->item->showAssetName()).'</a>';
-                $item_type = 'asset';
-            } elseif ($activity->item) {
-                $activity_item = '<a href="' . route('view/' . $activity->itemType(),
-                        $activity->item_id) . '">' . e($activity->item->name) . '</a>';
-                $item_type = $activity->itemType();
-
-            } else {
-                $activity_item = "unkonwn";
-                $item_type = "null";
-            }
-            
-
-            if (($activity->user) && ($activity->action_type=="uploaded") && ($activity->itemType()=="user")) {
-                $activity_target = '<a href="'.route('view/user', $activity->target_id).'">'.$activity->user->fullName().'</a>';
-            } elseif ($activity->target_type === "App\Models\Asset") {
-                if($activity->target) {
-                    $activity_target = '<a href="'.route('view/hardware', $activity->target_id).'">'.$activity->target->showAssetName().'</a>';
-                } else {
-                    $activity_target = "";
-                }
-            } elseif ( $activity->target_type === "App\Models\User") {
-                if($activity->target) {
-                   $activity_target = '<a href="'.route('view/user', $activity->target_id).'">'.$activity->target->fullName().'</a>';
-                } else {
-                    $activity_target = '';
-                }
-            } elseif (($activity->action_type=='accepted') || ($activity->action_type=='declined')) {
-                $activity_target = '<a href="' . route('view/user', $activity->item->assigneduser->id) . '">' . e($activity->item->assigneduser->fullName()) . '</a>';
-
-            } elseif ($activity->action_type=='requested') {
-                if ($activity->user) {
-                    $activity_target =  '<a href="'.route('view/user', $activity->user_id).'">'.$activity->user->fullName().'</a>';
-                } else {
-                    $activity_target = '';
-                }
-            } else {
-                if($activity->target) {
-                    $activity_target = $activity->target->id;
-                } else {
-                    $activity_target = "";
-                }
-            }
-
-            
-            $rows[] = array(
-                'icon'          => $activity_icons,
-                'created_at'    => date("M d, Y g:iA", strtotime($activity->created_at)),
-                'action_type'              => strtolower(trans('general.'.str_replace(' ','_',$activity->action_type))),
-                'admin'         =>  $activity->user ? (string) link_to('/admin/users/'.$activity->user_id.'/view', $activity->user->fullName()) : '',
-                'target'          => $activity_target,
-                'item'          => $activity_item,
-                'item_type'     => $item_type,
-                'note'     => e($activity->note),
-
-            );
-        }
-
-        $data = array('total'=>$activityCount, 'rows'=>$rows);
-
-        return $data;
-
-    }

    /**
     * Displays license report
@@ -431,7 +299,7 @@ class ReportsController extends Controller
                           ->with('company')
                           ->get();

-        return View::make('reports/licenses', compact('licenses'));
+        return view('reports/licenses', compact('licenses'));
    }

    /**
@@ -495,7 +363,7 @@ class ReportsController extends Controller
    public function getCustomReport()
    {
        $customfields = CustomField::get();
-        return View::make('reports/custom')->with('customfields', $customfields);
+        return view('reports/custom')->with('customfields', $customfields);
    }

    /**
@@ -508,7 +376,7 @@ class ReportsController extends Controller
     */
    public function postCustom()
    {
-        $assets = Asset::orderBy('created_at', 'DESC')->with('company','assigneduser', 'assetloc','defaultLoc','assigneduser.userloc','model','supplier','assetstatus','model.manufacturer')->get();
+        $assets = Asset::orderBy('created_at', 'DESC')->with('company', 'assigneduser', 'assetloc', 'defaultLoc', 'assigneduser.userloc', 'model', 'supplier', 'assetstatus', 'model.manufacturer')->get();
        $customfields = CustomField::get();

        $rows   = [ ];
@@ -580,6 +448,10 @@ class ReportsController extends Controller
            $header[] = trans('admin/hardware/form.expected_checkin');
        }

+        if (e(Input::get('notes')) == '1') {
+            $header[] = 'Notes';
+        }
+

        foreach ($customfields as $customfield) {
            if (e(Input::get($customfield->db_column_name())) == '1') {
@@ -629,7 +501,7 @@ class ReportsController extends Controller
                $row[] = '"' . Helper::formatCurrencyOutput($asset->purchase_cost) . '"';
            }
            if (e(Input::get('eol')) == '1') {
-                $row[] = '"' .($asset->eol_date()) ? $asset->eol_date() : ''. '"';
+                $row[] = '"' .($asset->present()->eol_date()) ? $asset->present()->eol_date() : ''. '"';
            }
            if (e(Input::get('order')) == '1') {
                if ($asset->order_number) {
@@ -647,34 +519,25 @@ class ReportsController extends Controller
            }

            if (e(Input::get('location')) == '1') {
-                $show_loc = '';
-
-
-                if (($asset->assigned_to > 0) && ($asset->assigneduser) && ($asset->assigneduser->location)) {
-                    $show_loc .= '"' .e($asset->assigneduser->location->name). '"';
-                } elseif ($asset->rtd_location_id!='') {
-                    $location = Location::find($asset->rtd_location_id);
-                    if ($location) {
-                        $show_loc .= '"' .e($location->name). '"';
-                    } else {
-                        $show_loc .= 'Default location '.$asset->rtd_location_id.' is invalid';
-                    }
+                if($asset->assetLoc) {
+                    $show_loc = $asset->assetLoc->present()->name();
+                } else {
+                    $show_loc = 'Default location '.$asset->rtd_location_id.' is invalid';
                }
-
                $row[] = $show_loc;
-
            }


            if (e(Input::get('assigned_to')) == '1') {
-                if ($asset->assigneduser) {
-                    $row[] = '"' .e($asset->assigneduser->fullName()). '"';
+                if ($asset->assignedTo) {
+                    $row[] = '"' .e($asset->assignedTo->present()->name()). '"';
                } else {
                    $row[] = ''; // Empty string if unassigned
                }
            }

            if (e(Input::get('username')) == '1') {
+                // Only works if we're checked out to a user, not anything else.
                if ($asset->assigneduser) {
                    $row[] = '"' .e($asset->assigneduser->username). '"';
                } else {
@@ -683,6 +546,7 @@ class ReportsController extends Controller
            }

            if (e(Input::get('employee_num')) == '1') {
+                // Only works if we're checked out to a user, not anything else.
                if ($asset->assigneduser) {
                    $row[] = '"' .e($asset->assigneduser->employee_num). '"';
                } else {
@@ -704,7 +568,7 @@ class ReportsController extends Controller
            if (e(Input::get('warranty')) == '1') {
                if ($asset->warranty_months) {
                    $row[] = $asset->warranty_months;
-                    $row[] = $asset->warrantee_expires();
+                    $row[] = $asset->present()->warrantee_expires();
                } else {
                    $row[] = '';
                    $row[] = '';
@@ -724,6 +588,14 @@ class ReportsController extends Controller
                }
            }

+            if (e(Input::get('notes')) == '1') {
+                if ($asset->notes) {
+                    $row[] = '"' .$asset->notes. '"';
+                } else {
+                    $row[] = ''; // Empty string if unassigned
+                }
+            }
+
            foreach ($customfields as $customfield) {
                $column_name = $customfield->db_column_name();
                if (e(Input::get($customfield->db_column_name())) == '1') {
@@ -748,7 +620,7 @@ class ReportsController extends Controller
                ->with('error', trans('admin/reports/message.error'));
        }
    }
-    
+

    /**
     * getImprovementsReport
@@ -764,7 +636,7 @@ class ReportsController extends Controller
                                              ->orderBy('created_at', 'DESC')
                                              ->get();

-        return View::make('reports/asset_maintenances', compact('assetMaintenances'));
+        return view('reports/asset_maintenances', compact('assetMaintenances'));

    }

@@ -839,7 +711,7 @@ class ReportsController extends Controller
    {
        $assetsForReport = Asset::notYetAccepted()->with('company')->get();

-        return View::make('reports/unaccepted_assets', compact('assetsForReport'));
+        return view('reports/unaccepted_assets', compact('assetsForReport'));
    }

    /**
@@ -873,9 +745,9 @@ class ReportsController extends Controller
            $row    = [ ];
            $row[]  = str_replace(',', '', e($assetItem->assetlog->model->category->name));
            $row[]  = str_replace(',', '', e($assetItem->assetlog->model->name));
-            $row[]  = str_replace(',', '', e($assetItem->assetlog->showAssetName()));
+            $row[]  = str_replace(',', '', e($assetItem->assetlog->present()->name()));
            $row[]  = str_replace(',', '', e($assetItem->assetlog->asset_tag));
-            $row[]  = str_replace(',', '', e($assetItem->assetlog->assigneduser->fullName()));
+            $row[]  = str_replace(',', '', e($assetItem->assetlog->assignedTo->present()->name()));
            $rows[] = implode($row, ',');
        }

--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -3,6 +3,7 @@ namespace App\Http\Controllers;

 use Input;
 use Lang;
+use Illuminate\Http\Request;
 use App\Models\Setting;
 use App\Models\Ldap;
 use Redirect;
@@ -18,6 +19,7 @@ use Mail;
 use Auth;
 use App\Models\User;
 use App\Http\Requests\SetupUserRequest;
+use App\Http\Requests\ImageUploadRequest;

 /**
 * This controller handles all actions related to Settings for
@@ -55,23 +57,32 @@ class SettingsController extends Controller

        $host = $_SERVER['SERVER_NAME'];
        if (($protocol === 'http://' && $_SERVER['SERVER_PORT'] != '80') || ($protocol === 'https://' && $_SERVER['SERVER_PORT'] != '443')) {
-          $host .= ':' . $_SERVER['SERVER_PORT'];
+            $host .= ':' . $_SERVER['SERVER_PORT'];
        }
        $pageURL = $protocol . $host . $_SERVER['REQUEST_URI'];

-        $start_settings['url_valid'] = (config('app.url').'/setup' === $pageURL);
+        $start_settings['url_valid'] = (url('/').'/setup' === $pageURL);

-        $start_settings['url_config'] = config('app.url');
+        $start_settings['url_config'] = url('/');
        $start_settings['real_url'] = $pageURL;
+        
+        // Curl the .env file to make sure it's not accessible via a browser
+        $ch = curl_init($protocol . $host.'/.env');
+        curl_setopt($ch, CURLOPT_HEADER, true);    // we want headers
+        curl_setopt($ch, CURLOPT_NOBODY, true);    // we don't need body
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+        $output = curl_exec($ch);
+        $httpcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        curl_close($ch);

-        $exposed_env = @file_get_contents($protocol . $host.'/.env');
-
-        if ($exposed_env) {
-            $start_settings['env_exposed'] = true;
-        } else {
+        if ($httpcode == 404 || $httpcode == 403) {
            $start_settings['env_exposed'] = false;
+        } else {
+            $start_settings['env_exposed'] = true;
        }

+
        if (\App::Environment('production') && (config('app.debug')==true)) {
            $start_settings['debug_exposed'] = true;
        } else {
@@ -118,7 +129,7 @@ class SettingsController extends Controller


        $start_settings['gd'] = extension_loaded('gd');
-        return View::make('setup/index')
+        return view('setup/index')
        ->with('step', 1)
        ->with('start_settings', $start_settings)
        ->with('section', 'Pre-Flight Check');
@@ -179,6 +190,7 @@ class SettingsController extends Controller
        $settings->user_id = 1;
        $settings->email_domain = e(Input::get('email_domain'));
        $settings->email_format = e(Input::get('email_format'));
+        $settings->next_auto_tag_base = 1;


        if ((!$user->isValid()) || (!$settings->isValid())) {
@@ -213,7 +225,7 @@ class SettingsController extends Controller
    */
    public function getSetupUser()
    {
-        return View::make('setup/user')
+        return view('setup/user')
        ->with('step', 3)
        ->with('section', 'Create a User');
    }
@@ -228,7 +240,7 @@ class SettingsController extends Controller
    public function getSetupDone()
    {

-        return View::make('setup/done')
+        return view('setup/done')
        ->with('step', 4)
        ->with('section', 'Done!');
    }
@@ -247,7 +259,14 @@ class SettingsController extends Controller
        Artisan::call('migrate', ['--force' => true]);

        $output = Artisan::output();
-        return View::make('setup/migrate')
+
+        if ((!file_exists(storage_path().'/oauth-private.key')) || (!file_exists(storage_path().'/oauth-public.key'))) {
+            Artisan::call('passport:install');
+            Artisan::call('migrate', ['--force' => true]);
+        }
+
+
+        return view('setup/migrate')
        ->with('output', $output)
        ->with('step', 2)
        ->with('section', 'Create Database Tables');
@@ -262,15 +281,15 @@ class SettingsController extends Controller
    * @since [v1.0]
    * @return View
    */
-    public function getIndex()
+    public function index()
    {
        $settings = Setting::all();
-        return View::make('settings/index', compact('settings'));
+        return view('settings/index', compact('settings'));
    }


    /**
-    * Return a form to allow a super admin to update settings.
+    * Return the admin settings page
    *
    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @since [v1.0]
@@ -279,95 +298,469 @@ class SettingsController extends Controller
    public function getEdit()
    {
        $setting = Setting::first();
-        $is_gd_installed = extension_loaded('gd');
-
-        return View::make('settings/edit', compact('setting'))->with('is_gd_installed', $is_gd_installed);
+        return view('settings/general', compact('setting'));
    }


    /**
-    * Validate and process settings edit form.
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @since [v1.0]
-    * @return Redirect
-    */
-    public function postEdit()
+     * Return a form to allow a super admin to update settings.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return View
+     */
+    public function getSettings()
+    {
+        $setting = Setting::first();
+        return view('settings/general', compact('setting'));
+    }
+
+
+    /**
+     * Return a form to allow a super admin to update settings.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return View
+     */
+    public function postSettings(Request $request)
    {

-        // Check if the asset exists
        if (is_null($setting = Setting::first())) {
-            // Redirect to the asset management page with error
            return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
        }

-        if (Input::get('clear_logo')=='1') {
-            $setting->logo = null;
-        } elseif (Input::file('logo_img')) {
-            if (!config('app.lock_passwords')) {
-                $image = Input::file('logo_img');
-                $file_name = "logo.".$image->getClientOriginalExtension();
-                $path = public_path('uploads/'.$file_name);
-                Image::make($image->getRealPath())->resize(null, 40, function ($constraint) {
-                    $constraint->aspectRatio();
-                    $constraint->upsize();
-                })->save($path);
-                $setting->logo = $file_name;
-            }
-        }
-
-
-        if (!config('app.lock_passwords')) {
-            $setting->site_name = e(Input::get('site_name'));
-            $setting->brand = e(Input::get('brand'));
-            $setting->custom_css = e(Input::get('custom_css'));
-
-            if (Input::get('two_factor_enabled')=='') {
-                $setting->two_factor_enabled = null;
-            } else {
-                $setting->two_factor_enabled = e(Input::get('two_factor_enabled'));
-            }
-
-        }
+        $setting->full_multiple_companies_support = $request->input('full_multiple_companies_support', '0');
+        $setting->load_remote = $request->input('load_remote', '0');
+        $setting->email_domain = $request->input('email_domain');
+        $setting->email_format = $request->input('email_format');
+        $setting->username_format = $request->input('username_format');
+        $setting->require_accept_signature = $request->input('require_accept_signature');
+        $setting->login_note = $request->input('login_note');
+        $setting->default_eula_text = $request->input('default_eula_text');
+        $setting->thumbnail_max_h = $request->input('thumbnail_max_h');

        if (Input::get('per_page')!='') {
-            $setting->per_page = e(Input::get('per_page'));
+            $setting->per_page = $request->input('per_page');
        } else {
            $setting->per_page = 200;
        }

-        $setting->locale = e(Input::get('locale', 'en'));
-        $setting->qr_code = e(Input::get('qr_code', '0'));
-        $setting->full_multiple_companies_support = e(Input::get('full_multiple_companies_support', '0'));
-        $setting->alt_barcode = e(Input::get('alt_barcode'));
-        $setting->alt_barcode_enabled = e(Input::get('alt_barcode_enabled', '0'));
-        $setting->barcode_type = e(Input::get('barcode_type'));
-        $setting->load_remote = e(Input::get('load_remote', '0'));
-        $setting->default_currency = e(Input::get('default_currency', '$'));
-        $setting->qr_text = e(Input::get('qr_text'));
-        $setting->auto_increment_prefix = e(Input::get('auto_increment_prefix'));
-        $setting->auto_increment_assets = e(Input::get('auto_increment_assets', '0'));
-        $setting->zerofill_count = e(Input::get('zerofill_count'));
-        $setting->alert_interval = e(Input::get('alert_interval'));
-        $setting->alert_threshold = e(Input::get('alert_threshold'));
-        $setting->email_domain = e(Input::get('email_domain'));
-        $setting->email_format = e(Input::get('email_format'));
-        $setting->username_format = e(Input::get('username_format'));
-        $setting->require_accept_signature = e(Input::get('require_accept_signature'));
+        if ($setting->save()) {
+            return redirect()->route('settings.index')
+                ->with('success', trans('admin/settings/message.update.success'));
+        }
+        return redirect()->back()->withInput()->withErrors($setting->getErrors());
+
+    }


-        $setting->labels_per_page = e(Input::get('labels_per_page'));
-        $setting->labels_width = e(Input::get('labels_width'));
-        $setting->labels_height = e(Input::get('labels_height'));
-        $setting->labels_pmargin_left = e(Input::get('labels_pmargin_left'));
-        $setting->labels_pmargin_right = e(Input::get('labels_pmargin_right'));
-        $setting->labels_pmargin_top = e(Input::get('labels_pmargin_top'));
-        $setting->labels_pmargin_bottom = e(Input::get('labels_pmargin_bottom'));
-        $setting->labels_display_bgutter = e(Input::get('labels_display_bgutter'));
-        $setting->labels_display_sgutter = e(Input::get('labels_display_sgutter'));
-        $setting->labels_fontsize = e(Input::get('labels_fontsize'));
-        $setting->labels_pagewidth = e(Input::get('labels_pagewidth'));
-        $setting->labels_pageheight = e(Input::get('labels_pageheight'));
+
+    /**
+     * Return a form to allow a super admin to update settings.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return View
+     */
+    public function getBranding()
+    {
+        $setting = Setting::first();
+        return view('settings.branding', compact('setting'));
+    }
+
+
+    /**
+     * Return a form to allow a super admin to update settings.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return View
+     */
+    public function postBranding(ImageUploadRequest $request)
+    {
+
+        if (is_null($setting = Setting::first())) {
+            return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
+        }
+
+        $setting->brand = $request->input('brand', '1');
+        $setting->header_color = $request->input('header_color');
+
+
+        // Only allow the site name and CSS to be changed if lock_passwords is false
+        // Because public demos make people act like dicks
+        if (!config('app.lock_passwords')) {
+            $setting->site_name = $request->input('site_name');
+            $setting->custom_css = $request->input('custom_css');
+        }
+
+
+        // If the user wants to clear the logo, reset the brand type
+        if ($request->input('clear_logo')=='1') {
+            $setting->logo = null;
+            $setting->brand = 1;
+
+        // If they are uploading an image, validate it and upload it
+        } elseif ($request->hasFile('image')) {
+
+            if (!config('app.lock_passwords')) {
+                $image = $request->file('image');
+                $file_name = "logo.".$image->getClientOriginalExtension();
+                $path = public_path('uploads');
+                if ($image->getClientOriginalExtension()!='svg') {
+                    Image::make($image->getRealPath())->resize(null, 40, function ($constraint) {
+                        $constraint->aspectRatio();
+                        $constraint->upsize();
+                    })->save($path.'/'.$file_name);
+                } else {
+                    $image->move($path, $file_name);
+                }
+                $setting->logo = $file_name;
+            }
+        }
+
+        if ($setting->save()) {
+            return redirect()->route('settings.index')
+                ->with('success', trans('admin/settings/message.update.success'));
+        }
+        return redirect()->back()->withInput()->withErrors($setting->getErrors());
+
+    }
+
+
+
+    /**
+     * Return a form to allow a super admin to update settings.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return View
+     */
+    public function getSecurity()
+    {
+        $setting = Setting::first();
+        return view('settings.security', compact('setting'));
+    }
+
+
+    /**
+     * Return a form to allow a super admin to update settings.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return View
+     */
+    public function postSecurity(Request $request)
+    {
+
+        if (is_null($setting = Setting::first())) {
+            return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
+        }
+
+
+        if (!config('app.lock_passwords')) {
+
+            if ($request->input('two_factor_enabled')=='') {
+                $setting->two_factor_enabled = null;
+            } else {
+                $setting->two_factor_enabled = $request->input('two_factor_enabled');
+            }
+
+        }
+
+        $setting->pwd_secure_uncommon = (int) $request->input('pwd_secure_uncommon');
+        $setting->pwd_secure_min = (int) $request->input('pwd_secure_min');
+        $setting->pwd_secure_complexity = '';
+
+        if ($request->has('pwd_secure_complexity')) {
+            $setting->pwd_secure_complexity =  implode('|', $request->input('pwd_secure_complexity'));
+        }
+
+
+
+        if ($setting->save()) {
+            return redirect()->route('settings.index')
+                ->with('success', trans('admin/settings/message.update.success'));
+        }
+        return redirect()->back()->withInput()->withErrors($setting->getErrors());
+
+    }
+
+
+    /**
+     * Return a form to allow a super admin to update settings.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return View
+     */
+    public function getLocalization()
+    {
+        $setting = Setting::first();
+        return view('settings.localization', compact('setting'));
+    }
+
+
+    /**
+     * Return a form to allow a super admin to update settings.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return View
+     */
+    public function postLocalization(Request $request)
+    {
+
+        if (is_null($setting = Setting::first())) {
+            return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
+        }
+
+        $setting->locale = $request->input('locale', 'en');
+        $setting->default_currency = $request->input('default_currency', '$');
+        $setting->date_display_format = $request->input('date_display_format');
+        $setting->time_display_format = $request->input('time_display_format');
+
+        if ($setting->save()) {
+            return redirect()->route('settings.index')
+                ->with('success', trans('admin/settings/message.update.success'));
+        }
+        return redirect()->back()->withInput()->withErrors($setting->getErrors());
+
+    }
+
+
+    /**
+     * Return a form to allow a super admin to update settings.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return View
+     */
+    public function getAlerts()
+    {
+        $setting = Setting::first();
+        return view('settings.alerts', compact('setting'));
+    }
+
+
+    /**
+     * Return a form to allow a super admin to update settings.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return View
+     */
+    public function postAlerts(Request $request)
+    {
+
+        if (is_null($setting = Setting::first())) {
+            return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
+        }
+
+        $alert_email = rtrim($request->input('alert_email'), ',');
+        $alert_email = trim($alert_email);
+
+        $setting->alert_email = e($alert_email);
+        $setting->alerts_enabled = $request->input('alerts_enabled', '0');
+        $setting->alert_interval = $request->input('alert_interval');
+        $setting->alert_threshold = $request->input('alert_threshold');
+
+        if ($setting->save()) {
+            return redirect()->route('settings.index')
+                ->with('success', trans('admin/settings/message.update.success'));
+        }
+        return redirect()->back()->withInput()->withErrors($setting->getErrors());
+
+    }
+
+
+    /**
+     * Return a form to allow a super admin to update settings.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return View
+     */
+    public function getSlack()
+    {
+        $setting = Setting::first();
+        return view('settings.slack', compact('setting'));
+    }
+
+
+    /**
+     * Return a form to allow a super admin to update settings.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return View
+     */
+    public function postSlack(Request $request)
+    {
+
+        if (is_null($setting = Setting::first())) {
+            return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
+        }
+
+        $setting->slack_endpoint = $request->input('slack_endpoint');
+        $setting->slack_channel = $request->input('slack_channel');
+        $setting->slack_botname = $request->input('slack_botname');
+
+        if ($setting->save()) {
+            return redirect()->route('settings.index')
+                ->with('success', trans('admin/settings/message.update.success'));
+        }
+        return redirect()->back()->withInput()->withErrors($setting->getErrors());
+
+    }
+
+
+    /**
+     * Return a form to allow a super admin to update settings.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return View
+     */
+    public function getAssetTags()
+    {
+        $setting = Setting::first();
+        return view('settings.asset_tags', compact('setting'));
+    }
+
+
+    /**
+     * Saves settings from form
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return View
+     */
+    public function postAssetTags(Request $request)
+    {
+
+        if (is_null($setting = Setting::first())) {
+            return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
+        }
+
+        $setting->auto_increment_prefix = $request->input('auto_increment_prefix');
+        $setting->auto_increment_assets = $request->input('auto_increment_assets', '0');
+        $setting->zerofill_count = $request->input('zerofill_count');
+        $setting->next_auto_tag_base = $request->input('next_auto_tag_base');
+
+        if ($setting->save()) {
+            return redirect()->route('settings.index')
+                ->with('success', trans('admin/settings/message.update.success'));
+        }
+        return redirect()->back()->withInput()->withErrors($setting->getErrors());
+
+    }
+
+
+    /**
+     * Return a form to allow a super admin to update settings.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return View
+     */
+    public function getBarcodes()
+    {
+        $setting = Setting::first();
+        $is_gd_installed = extension_loaded('gd');
+
+        return view('settings.barcodes', compact('setting'))->with('is_gd_installed',$is_gd_installed);
+    }
+
+
+    /**
+     * Saves settings from form
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return View
+     */
+    public function postBarcodes(Request $request)
+    {
+
+        if (is_null($setting = Setting::first())) {
+            return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
+        }
+
+        $setting->qr_code = $request->input('qr_code', '0');
+        $setting->alt_barcode = $request->input('alt_barcode');
+        $setting->alt_barcode_enabled = $request->input('alt_barcode_enabled', '0');
+        $setting->barcode_type = $request->input('barcode_type');
+        $setting->qr_text = $request->input('qr_text');
+
+
+        if ($setting->save()) {
+            return redirect()->route('settings.index')
+                ->with('success', trans('admin/settings/message.update.success'));
+        }
+        return redirect()->back()->withInput()->withErrors($setting->getErrors());
+
+    }
+
+
+    /**
+     * Return a form to allow a super admin to update settings.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return View
+     */
+    public function getPhpInfo()
+    {
+        if (config('app.debug')=== true) {
+            return view('settings.phpinfo');
+        }
+        return redirect()->route('settings.index')
+            ->with('error', 'PHP syetem debugging information is only available when debug is enabled in your .env file.');
+    }
+
+
+    /**
+     * Return a form to allow a super admin to update settings.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return View
+     */
+    public function getLabels()
+    {
+        $setting = Setting::first();
+        return view('settings.labels', compact('setting'));
+    }
+
+
+    /**
+     * Saves settings from form
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return View
+     */
+    public function postLabels(Request $request)
+    {
+
+        if (is_null($setting = Setting::first())) {
+            return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
+        }
+        $setting->labels_per_page = $request->input('labels_per_page');
+        $setting->labels_width = $request->input('labels_width');
+        $setting->labels_height = $request->input('labels_height');
+        $setting->labels_pmargin_left = $request->input('labels_pmargin_left');
+        $setting->labels_pmargin_right = $request->input('labels_pmargin_right');
+        $setting->labels_pmargin_top = $request->input('labels_pmargin_top');
+        $setting->labels_pmargin_bottom = $request->input('labels_pmargin_bottom');
+        $setting->labels_display_bgutter = $request->input('labels_display_bgutter');
+        $setting->labels_display_sgutter = $request->input('labels_display_sgutter');
+        $setting->labels_fontsize = $request->input('labels_fontsize');
+        $setting->labels_pagewidth = $request->input('labels_pagewidth');
+        $setting->labels_pageheight = $request->input('labels_pageheight');
+


        if (Input::has('labels_display_name')) {
@@ -388,68 +781,76 @@ class SettingsController extends Controller
            $setting->labels_display_tag = 0;
        }

-        $alert_email = rtrim(Input::get('alert_email'), ',');
-        $alert_email = trim($alert_email);
-
-        $setting->alert_email = e($alert_email);
-        $setting->alerts_enabled = e(Input::get('alerts_enabled', '0'));
-        $setting->header_color = e(Input::get('header_color'));
-        $setting->default_eula_text = e(Input::get('default_eula_text'));
-        $setting->slack_endpoint = e(Input::get('slack_endpoint'));
-        $setting->slack_channel = e(Input::get('slack_channel'));
-        $setting->slack_botname = e(Input::get('slack_botname'));
-        $setting->ldap_enabled = e(Input::get('ldap_enabled', '0'));
-        $setting->ldap_server = e(Input::get('ldap_server'));
-        $setting->ldap_server_cert_ignore = e(Input::get('ldap_server_cert_ignore', false));
-        $setting->ldap_uname = e(Input::get('ldap_uname'));
-        if (Input::has('ldap_pword')) {
-            $setting->ldap_pword = Crypt::encrypt(Input::get('ldap_pword'));
+        if ($setting->save()) {
+            return redirect()->route('settings.index')
+                ->with('success', trans('admin/settings/message.update.success'));
        }
-        $setting->ldap_basedn = e(Input::get('ldap_basedn'));
-        $setting->ldap_filter = Input::get('ldap_filter');
-        $setting->ldap_username_field = Input::get('ldap_username_field');
-        $setting->ldap_lname_field = e(Input::get('ldap_lname_field'));
-        $setting->ldap_fname_field = e(Input::get('ldap_fname_field'));
-        $setting->ldap_auth_filter_query = Input::get('ldap_auth_filter_query');
-        $setting->ldap_version = e(Input::get('ldap_version'));
-        $setting->ldap_active_flag = e(Input::get('ldap_active_flag'));
-        $setting->ldap_emp_num = e(Input::get('ldap_emp_num'));
-        $setting->ldap_email = e(Input::get('ldap_email'));
-        $setting->ad_domain = e(Input::get('ad_domain'));
-        $setting->is_ad = e(Input::get('is_ad', '0'));
-        $setting->ldap_tls = e(Input::get('ldap_tls', '0'));
-        $setting->ldap_pw_sync = e(Input::get('ldap_pw_sync', '0'));
+        return redirect()->back()->withInput()->withErrors($setting->getErrors());
+
+    }
+
+
+    /**
+     * Return a form to allow a super admin to update settings.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return View
+     */
+    public function getLdapSettings()
+    {
+        $setting = Setting::first();
+        return view('settings.ldap', compact('setting'));
+    }
+
+
+    /**
+     * Saves settings from form
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return View
+     */
+    public function postLdapSettings(Request $request)
+    {
+
+        if (is_null($setting = Setting::first())) {
+            return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
+        }
+
+        $setting->ldap_enabled = $request->input('ldap_enabled', '0');
+        $setting->ldap_server = $request->input('ldap_server');
+        $setting->ldap_server_cert_ignore = $request->input('ldap_server_cert_ignore', false);
+        $setting->ldap_uname = $request->input('ldap_uname');
+        if (Input::has('ldap_pword')) {
+            $setting->ldap_pword = Crypt::encrypt($request->input('ldap_pword'));
+        }
+        $setting->ldap_basedn = $request->input('ldap_basedn');
+        $setting->ldap_filter = $request->input('ldap_filter');
+        $setting->ldap_username_field = $request->input('ldap_username_field');
+        $setting->ldap_lname_field = $request->input('ldap_lname_field');
+        $setting->ldap_fname_field = $request->input('ldap_fname_field');
+        $setting->ldap_auth_filter_query = $request->input('ldap_auth_filter_query');
+        $setting->ldap_version = $request->input('ldap_version');
+        $setting->ldap_active_flag = $request->input('ldap_active_flag');
+        $setting->ldap_emp_num = $request->input('ldap_emp_num');
+        $setting->ldap_email = $request->input('ldap_email');
+        $setting->ad_domain = $request->input('ad_domain');
+        $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');

        if ($setting->save()) {
-            return redirect()->to("admin/settings/app")->with('success', trans('admin/settings/message.update.success'));
-        } else {
-            return redirect()->back()->withInput()->withErrors($setting->getErrors());
+            return redirect()->route('settings.index')
+                ->with('success', trans('admin/settings/message.update.success'));
        }
-
-
-        // Redirect to the setting management page
-        return redirect()->to("admin/settings/app/edit")->with('error', trans('admin/settings/message.update.error'));
+        return redirect()->back()->withInput()->withErrors($setting->getErrors());

    }


-    public function getLdapTest() {
-
-        try {
-            $connection = Ldap::connectToLdap();
-            try {
-                Ldap::bindAdminToLdap($connection);
-                return response()->json(['message' => 'It worked!'], 200);
-            } catch (\Exception $e) {
-                return response()->json(['message' => $e->getMessage()], 500);
-            }
-            return response()->json(['message' => 'It worked!'], 200);
-        } catch (\Exception $e) {
-            return response()->json(['message' => $e->getMessage()], 500);
-        }


-    }


    /**
@@ -485,7 +886,7 @@ class SettingsController extends Controller
        }


-        return View::make('settings/backups', compact('path', 'files'));
+        return view('settings/backups', compact('path', 'files'));
    }


@@ -501,10 +902,9 @@ class SettingsController extends Controller
    {
        if (!config('app.lock_passwords')) {
            Artisan::call('backup:run');
-            return redirect()->to("admin/settings/backups")->with('success', trans('admin/settings/message.backup.generated'));
+            return redirect()->route('settings.backups.index')->with('success', trans('admin/settings/message.backup.generated'));
        } else {
-
-            return redirect()->to("admin/settings/backups")->with('error', trans('general.feature_disabled'));
+            return redirect()->to("settings.backups.index")->with('error', trans('general.feature_disabled'));
        }


@@ -528,11 +928,11 @@ class SettingsController extends Controller
            } else {

                // Redirect to the backup page
-                return redirect()->route('settings/backups')->with('error', trans('admin/settings/message.backup.file_not_found'));
+                return redirect()->route('settings.backups.index')->with('error', trans('admin/settings/message.backup.file_not_found'));
            }
        } else {
            // Redirect to the backup page
-            return redirect()->route('settings/backups')->with('error', trans('general.feature_disabled'));
+            return redirect()->route('settings.backups.index')->with('error', trans('general.feature_disabled'));
        }


@@ -554,17 +954,29 @@ class SettingsController extends Controller
            $file = $path.'/'.$filename;
            if (file_exists($file)) {
                unlink($file);
-                return redirect()->route('settings/backups')->with('success', trans('admin/settings/message.backup.file_deleted'));
+                return redirect()->route('settings.backups.index')->with('success', trans('admin/settings/message.backup.file_deleted'));
            } else {
-                return redirect()->route('settings/backups')->with('error', trans('admin/settings/message.backup.file_not_found'));
+                return redirect()->route('settings.backups.index')->with('error', trans('admin/settings/message.backup.file_not_found'));
            }
        } else {
-            return redirect()->route('settings/backups')->with('error', trans('general.feature_disabled'));
+            return redirect()->route('settings.backups.index')->with('error', trans('general.feature_disabled'));
        }

    }


+    /**
+     * Return a form to allow a super admin to update settings.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return View
+     */
+    public function getPurge()
+    {
+        return view('settings.purge-form');
+    }
+
    /**
    * Purges soft-deletes
    *
@@ -578,7 +990,7 @@ class SettingsController extends Controller
            if (Input::get('confirm_purge')=='DELETE') {
                Artisan::call('snipeit:purge', ['--force'=>'true','--no-interaction'=>true]);
                $output = Artisan::output();
-                return View::make('settings/purge')
+                return view('settings/purge')
                ->with('output', $output)->with('success', trans('admin/settings/message.purge.success'));
            } else {
                return redirect()->back()->with('error', trans('admin/settings/message.purge.validation_failed'));
@@ -588,4 +1000,18 @@ class SettingsController extends Controller
            return redirect()->back()->with('error', trans('general.feature_disabled'));
        }
    }
+
+    /**
+     * Returns a page with the API token generation interface.
+     *
+     * We created a controller method for this because closures aren't allowed
+     * in the routes file if you want to be able to cache the routes.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return View
+     */
+    public function api() {
+        return view('settings.api');
+    }
 }
--- a/app/Http/Controllers/StatuslabelsController.php
+++ b/app/Http/Controllers/StatuslabelsController.php
@@ -27,123 +27,93 @@ class StatuslabelsController extends Controller
    /**
     * Show a list of all the statuslabels.
     *
-     * @return View
+     * @return \Illuminate\Contracts\View\View
     */

-    public function getIndex()
+    public function index()
    {
-        // Show the page
-        return View::make('statuslabels/index', compact('statuslabels'));
+        return view('statuslabels/index', compact('statuslabels'));
    }

-
-    /**
-     * Show a count of assets by status label
-     *
-     * @return View
-     */
-
-    public function getAssetCountByStatuslabel()
+    public function show($id)
    {
-        $colors = [];
-
-        $statuslabels = Statuslabel::with('assets')->get();
-        $labels=[];
-        $points=[];
-        $colors=[];
-        foreach ($statuslabels as $statuslabel) {
-            if ($statuslabel->assets->count() > 0) {
-                $labels[]=$statuslabel->name;
-                $points[]=$statuslabel->assets()->whereNull('assigned_to')->count();
-                if ($statuslabel->color!='') {
-                    $colors[]=$statuslabel->color;
-                }
-            }
-
+        $statuslabel = Statuslabel::find($id);

+        if (isset($statuslabel->id)) {
+            return view('statuslabels/view', compact('statuslabel'));
        }
-        $labels[]='Deployed';
-        $points[]=Asset::whereNotNull('assigned_to')->count();

-        $colors_array = array_merge($colors, Helper::chartColors());
-
-        $result= [
-            "labels" => $labels,
-            "datasets" => [ [
-                "data" => $points,
-                "backgroundColor" => $colors_array,
-                "hoverBackgroundColor" =>  $colors_array
-            ]]
-        ];
-        return $result;
+        return redirect()->route('statuslabels.index')->with('error', trans('admin/locations/message.does_not_exist', compact('id')));
    }


+
    /**
     * Statuslabel create.
     *
-     * @return View
+     * @return \Illuminate\Contracts\View\View
     */
-    public function getCreate()
+    public function create()
    {
        // Show the page
        $item = new Statuslabel;
        $use_statuslabel_type = $item->getStatuslabelType();
        $statuslabel_types = Helper::statusTypeList();

-        return View::make('statuslabels/edit', compact('statuslabel_types', 'item'))->with('use_statuslabel_type', $use_statuslabel_type);
+        return view('statuslabels/edit', compact('statuslabel_types', 'item'))->with('use_statuslabel_type', $use_statuslabel_type);
    }


    /**
     * Statuslabel create form processing.
     *
-     * @return Redirect
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function postCreate(Request $request)
+    public function store(Request $request)
    {

        // create a new model instance
-        $statuslabel = new Statuslabel();
+        $statusLabel = new Statuslabel();

        if (!$request->has('statuslabel_types')) {
            return redirect()->back()->withInput()->withErrors(['statuslabel_types' => trans('validation.statuslabel_type')]);
        }

-        $statustype = Statuslabel::getStatuslabelTypesForDB($request->input('statuslabel_types'));
+        $statusType = Statuslabel::getStatuslabelTypesForDB($request->input('statuslabel_types'));

        // Save the Statuslabel data
-        $statuslabel->name              = e(Input::get('name'));
-        $statuslabel->user_id          = Auth::user()->id;
-        $statuslabel->notes          =  e(Input::get('notes'));
-        $statuslabel->deployable          =  $statustype['deployable'];
-        $statuslabel->pending          =  $statustype['pending'];
-        $statuslabel->archived          =  $statustype['archived'];
-        $statuslabel->color          =  e(Input::get('color'));
-        $statuslabel->show_in_nav          =  e(Input::get('show_in_nav'),0);
+        $statusLabel->name              = Input::get('name');
+        $statusLabel->user_id           = Auth::id();
+        $statusLabel->notes             =  Input::get('notes');
+        $statusLabel->deployable        =  $statusType['deployable'];
+        $statusLabel->pending           =  $statusType['pending'];
+        $statusLabel->archived          =  $statusType['archived'];
+        $statusLabel->color             =  Input::get('color');
+        $statusLabel->show_in_nav       =  Input::get('show_in_nav', 0);


        // Was the asset created?
-        if ($statuslabel->save()) {
+        if ($statusLabel->save()) {
            // Redirect to the new Statuslabel  page
-            return redirect()->to("admin/settings/statuslabels")->with('success', trans('admin/statuslabels/message.create.success'));
+            return redirect()->route('statuslabels.index')->with('success', trans('admin/statuslabels/message.create.success'));
        }
-
-        return redirect()->back()->withInput()->withErrors($statuslabel->getErrors());
-
+        return redirect()->back()->withInput()->withErrors($statusLabel->getErrors());
    }

-    public function store(Request $request)
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function apiStore(Request $request)
    {
-
        $statuslabel = new Statuslabel();
        if (!$request->has('statuslabel_types')) {
            return JsonResponse::create(["error" => trans('validation.statuslabel_type')], 500);
        }
-
        $statustype = Statuslabel::getStatuslabelTypesForDB(Input::get('statuslabel_types'));
-        $statuslabel->name            = e(Input::get('name'));
-        $statuslabel->user_id         = Auth::user()->id;
+        $statuslabel->name            = Input::get('name');
+        $statuslabel->user_id         = Auth::id();
        $statuslabel->notes           =  '';
        $statuslabel->deployable      =  $statustype['deployable'];
        $statuslabel->pending         =  $statustype['pending'];
@@ -164,21 +134,21 @@ class StatuslabelsController extends Controller
     * Statuslabel update.
     *
     * @param  int  $statuslabelId
-     * @return View
+     * @return \Illuminate\Contracts\View\View
     */
-    public function getEdit($statuslabelId = null)
+    public function edit($statuslabelId = null)
    {
        // Check if the Statuslabel exists
        if (is_null($item = Statuslabel::find($statuslabelId))) {
            // Redirect to the blogs management page
-            return redirect()->to('admin/settings/statuslabels')->with('error', trans('admin/statuslabels/message.does_not_exist'));
+            return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.does_not_exist'));
        }

        $use_statuslabel_type = $item->getStatuslabelType();

        $statuslabel_types = array('' => trans('admin/hardware/form.select_statustype')) + array('undeployable' => trans('admin/hardware/general.undeployable')) + array('pending' => trans('admin/hardware/general.pending')) + array('archived' => trans('admin/hardware/general.archived')) + array('deployable' => trans('admin/hardware/general.deployable'));

-        return View::make('statuslabels/edit', compact('item', 'statuslabel_types'))->with('use_statuslabel_type', $use_statuslabel_type);
+        return view('statuslabels/edit', compact('item', 'statuslabel_types'))->with('use_statuslabel_type', $use_statuslabel_type);
    }


@@ -186,14 +156,14 @@ class StatuslabelsController extends Controller
     * Statuslabel update form processing page.
     *
     * @param  int  $statuslabelId
-     * @return Redirect
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function postEdit(Request $request, $statuslabelId = null)
+    public function update(Request $request, $statuslabelId = null)
    {
        // Check if the Statuslabel exists
        if (is_null($statuslabel = Statuslabel::find($statuslabelId))) {
            // Redirect to the blogs management page
-            return redirect()->to('admin/settings/statuslabels')->with('error', trans('admin/statuslabels/message.does_not_exist'));
+            return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.does_not_exist'));
        }

        if (!$request->has('statuslabel_types')) {
@@ -202,128 +172,46 @@ class StatuslabelsController extends Controller


        // Update the Statuslabel data
-        $statustype = Statuslabel::getStatuslabelTypesForDB(Input::get('statuslabel_types'));
-        $statuslabel->name              = e(Input::get('name'));
-        $statuslabel->notes          =  e(Input::get('notes'));
+        $statustype                 = Statuslabel::getStatuslabelTypesForDB(Input::get('statuslabel_types'));
+        $statuslabel->name              = Input::get('name');
+        $statuslabel->notes          =  Input::get('notes');
        $statuslabel->deployable          =  $statustype['deployable'];
        $statuslabel->pending          =  $statustype['pending'];
        $statuslabel->archived          =  $statustype['archived'];
-        $statuslabel->color          =  e(Input::get('color'));
-        $statuslabel->show_in_nav          =  e(Input::get('show_in_nav'),0);
+        $statuslabel->color          =  Input::get('color');
+        $statuslabel->show_in_nav          =  Input::get('show_in_nav', 0);


        // Was the asset created?
        if ($statuslabel->save()) {
            // Redirect to the saved Statuslabel page
-            return redirect()->to("admin/settings/statuslabels/")->with('success', trans('admin/statuslabels/message.update.success'));
-        } else {
-            return redirect()->back()->withInput()->withErrors($statuslabel->getErrors());
+            return redirect()->route("statuslabels.index")->with('success', trans('admin/statuslabels/message.update.success'));
        }
-
-
-        // Redirect to the Statuslabel management page
-        return redirect()->to("admin/settings/statuslabels/$statuslabelId/edit")->with('error', trans('admin/statuslabels/message.update.error'));
-
+        return redirect()->back()->withInput()->withErrors($statuslabel->getErrors());
    }

    /**
     * Delete the given Statuslabel.
     *
     * @param  int  $statuslabelId
-     * @return Redirect
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function getDelete($statuslabelId)
+    public function destroy($statuslabelId)
    {
        // Check if the Statuslabel exists
        if (is_null($statuslabel = Statuslabel::find($statuslabelId))) {
            // Redirect to the blogs management page
-            return redirect()->to('admin/settings/statuslabels')->with('error', trans('admin/statuslabels/message.not_found'));
+            return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.not_found'));
        }


-        if ($statuslabel->has_assets() > 0) {
-
-            // Redirect to the asset management page
-            return redirect()->to('admin/settings/statuslabels')->with('error', trans('admin/statuslabels/message.assoc_assets'));
-        } else {
-
+        if ($statuslabel->has_assets() == 0) {
            $statuslabel->delete();
-
            // Redirect to the statuslabels management page
-            return redirect()->to('admin/settings/statuslabels')->with('success', trans('admin/statuslabels/message.delete.success'));
+            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'));
    }

-
-    public function getDatatable()
-    {
-        $statuslabels = Statuslabel::select(array('id','name','deployable','pending','archived','color','show_in_nav'))
-        ->whereNull('deleted_at');
-
-        if (Input::has('search')) {
-            $statuslabels = $statuslabels->TextSearch(e(Input::get('search')));
-        }
-
-        if (Input::has('offset')) {
-            $offset = e(Input::get('offset'));
-        } else {
-            $offset = 0;
-        }
-
-        if (Input::has('limit')) {
-            $limit = e(Input::get('limit'));
-        } else {
-            $limit = 50;
-        }
-
-        $allowed_columns = ['id','name'];
-        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
-
-        $statuslabels->orderBy($sort, $order);
-
-        $statuslabelsCount = $statuslabels->count();
-        $statuslabels = $statuslabels->skip($offset)->take($limit)->get();
-
-        $rows = array();
-
-        foreach ($statuslabels as $statuslabel) {
-
-            if ($statuslabel->deployable == 1) {
-                $label_type = trans('admin/statuslabels/table.deployable');
-            } elseif ($statuslabel->pending == 1) {
-                $label_type = trans('admin/statuslabels/table.pending');
-            } elseif ($statuslabel->archived == 1) {
-                $label_type = trans('admin/statuslabels/table.archived');
-            } else {
-                $label_type = trans('admin/statuslabels/table.undeployable');
-            }
-
-            $actions = '<a href="'.route('update/statuslabel', $statuslabel->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/statuslabel', $statuslabel->id).'" data-content="'.trans('admin/statuslabels/message.delete.confirm').'" data-title="'.trans('general.delete').' '.htmlspecialchars($statuslabel->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
-
-            if ($statuslabel->color!='') {
-                $color = '<div class="pull-left" style="margin-right: 5px; height: 20px; width: 20px; background-color: '.e($statuslabel->color).'"></div>'.e($statuslabel->color);
-            } else {
-                $color = '';
-            }
-
-
-            $rows[] = array(
-                'id'            => e($statuslabel->id),
-                'type'          => e($label_type),
-                'name'          => e($statuslabel->name),
-                'color'          => $color,
-                'show_in_nav' => ($statuslabel->show_in_nav=='1') ? trans('general.yes') : trans('general.no'),
-                'actions'       => $actions
-            );
-        }
-
-        $data = array('total' => $statuslabelsCount, 'rows' => $rows);
-
-        return $data;
-
-    }
 }
--- a/app/Http/Controllers/SuppliersController.php
+++ b/app/Http/Controllers/SuppliersController.php
@@ -1,6 +1,7 @@
 <?php
 namespace App\Http\Controllers;

+use App\Helpers\Helper;
 use Image;
 use App\Models\AssetMaintenance;
 use Input;
@@ -26,63 +27,57 @@ class SuppliersController extends Controller
    /**
     * Show a list of all suppliers
     *
-     * @return View
+     * @return \Illuminate\Contracts\View\View
     */
-    public function getIndex()
+    public function index()
    {
        // Grab all the suppliers
        $suppliers = Supplier::orderBy('created_at', 'DESC')->get();

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


    /**
     * Supplier create.
     *
-     * @return View
+     * @return \Illuminate\Contracts\View\View
     */
-    public function getCreate()
+    public function create()
    {
-        return View::make('suppliers/edit')->with('item', new Supplier);
+        return view('suppliers/edit')->with('item', new Supplier);
    }


    /**
     * Supplier create form processing.
     *
-     * @return Redirect
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function postCreate()
+    public function store(Request $request)
    {
-
-        // get the POST data
-        $new = Input::all();
-
        // Create a new supplier
        $supplier = new Supplier;
        // Save the location data
-        $supplier->name                 = e(Input::get('name'));
-        $supplier->address              = e(Input::get('address'));
-        $supplier->address2             = e(Input::get('address2'));
-        $supplier->city                 = e(Input::get('city'));
-        $supplier->state                = e(Input::get('state'));
-        $supplier->country              = e(Input::get('country'));
-        $supplier->zip                  = e(Input::get('zip'));
-        $supplier->contact              = e(Input::get('contact'));
-        $supplier->phone                = e(Input::get('phone'));
-        $supplier->fax                  = e(Input::get('fax'));
-        $supplier->email                = e(Input::get('email'));
-        $supplier->notes                = e(Input::get('notes'));
-        $supplier->url                  = $supplier->addhttp(e(Input::get('url')));
-        $supplier->user_id              = Auth::user()->id;
-
-
-
+        $supplier->name                 = request('name');
+        $supplier->address              = request('address');
+        $supplier->address2             = request('address2');
+        $supplier->city                 = request('city');
+        $supplier->state                = request('state');
+        $supplier->country              = request('country');
+        $supplier->zip                  = request('zip');
+        $supplier->contact              = request('contact');
+        $supplier->phone                = request('phone');
+        $supplier->fax                  = request('fax');
+        $supplier->email                = request('email');
+        $supplier->notes                = request('notes');
+        $supplier->url                  = $supplier->addhttp(request('url'));
+        $supplier->user_id              = Auth::id();

        if (Input::file('image')) {
-            $image = Input::file('image');
+            $image = $request->file('image');
            $file_name = str_random(25).".".$image->getClientOriginalExtension();
            $path = public_path('uploads/suppliers/'.$file_name);
            Image::make($image->getRealPath())->resize(300, null, function ($constraint) {
@@ -95,43 +90,43 @@ class SuppliersController extends Controller
            // Was it created?
        if ($supplier->save()) {
          // Redirect to the new supplier  page
-            return redirect()->to("admin/settings/suppliers")->with('success', trans('admin/suppliers/message.create.success'));
+            return redirect()->route('suppliers.index')->with('success', trans('admin/suppliers/message.create.success'));
        }
-
-
        return redirect()->back()->withInput()->withErrors($supplier->getErrors());
-
    }

-    public function store(Request $request)
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function apiStore(Request $request)
    {
        $supplier = new Supplier;
-        $supplier->name =  e($request->input('name'));
-        $supplier->user_id              = Auth::user()->id;
+        $supplier->name =  $request->input('name');
+        $supplier->user_id              = Auth::id();

        if ($supplier->save()) {
            return JsonResponse::create($supplier);
        }
        return JsonResponse::create(["error" => "Failed validation: ".print_r($supplier->getErrors(), true)], 500);
-        return JsonResponse::create(["error" => "Couldn't save Supplier"]);
    }

    /**
     * Supplier update.
     *
     * @param  int  $supplierId
-     * @return View
+     * @return \Illuminate\Contracts\View\View
     */
-    public function getEdit($supplierId = null)
+    public function edit($supplierId = null)
    {
        // Check if the supplier exists
        if (is_null($item = Supplier::find($supplierId))) {
            // Redirect to the supplier  page
-            return redirect()->to('admin/settings/suppliers')->with('error', trans('admin/suppliers/message.does_not_exist'));
+            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.does_not_exist'));
        }

        // Show the page
-        return View::make('suppliers/edit', compact('item'));
+        return view('suppliers/edit', compact('item'));
    }


@@ -139,33 +134,33 @@ class SuppliersController extends Controller
     * Supplier update form processing page.
     *
     * @param  int  $supplierId
-     * @return Redirect
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function postEdit($supplierId = null)
+    public function update($supplierId = null, Request $request)
    {
        // Check if the supplier exists
        if (is_null($supplier = Supplier::find($supplierId))) {
            // Redirect to the supplier  page
-            return redirect()->to('admin/settings/suppliers')->with('error', trans('admin/suppliers/message.does_not_exist'));
+            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.does_not_exist'));
        }

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

        if (Input::file('image')) {
-            $image = Input::file('image');
+            $image = $request->file('image');
            $file_name = str_random(25).".".$image->getClientOriginalExtension();
            $path = public_path('uploads/suppliers/'.$file_name);
            Image::make($image->getRealPath())->resize(300, null, function ($constraint) {
@@ -175,12 +170,12 @@ class SuppliersController extends Controller
            $supplier->image = $file_name;
        }

-        if (Input::get('image_delete') == 1 && Input::file('image') == "") {
+        if (request('image_delete') == 1 && $request->file('image') == "") {
            $supplier->image = null;
        }

        if ($supplier->save()) {
-            return redirect()->to("admin/settings/suppliers")->with('success', trans('admin/suppliers/message.update.success'));
+            return redirect()->route('suppliers.index')->with('success', trans('admin/suppliers/message.update.success'));
        }

        return redirect()->back()->withInput()->withErrors($supplier->getErrors());
@@ -191,107 +186,49 @@ class SuppliersController extends Controller
     * Delete the given supplier.
     *
     * @param  int  $supplierId
-     * @return Redirect
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function getDelete($supplierId)
+    public function destroy($supplierId)
    {
        // Check if the supplier exists
        if (is_null($supplier = Supplier::find($supplierId))) {
            // Redirect to the suppliers page
-            return redirect()->to('admin/settings/suppliers')->with('error', trans('admin/suppliers/message.not_found'));
+            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.not_found'));
        }

-        if ($supplier->num_assets() > 0) {
-
-            // Redirect to the asset management page
-            return redirect()->to('admin/settings/suppliers')->with('error', trans('admin/suppliers/message.assoc_users'));
-        } else {
-
+        if ($supplier->num_assets() == 0) {
            // Delete the supplier
            $supplier->delete();
-
            // Redirect to the suppliers management page
-            return redirect()->to('admin/settings/suppliers')->with('success', trans('admin/suppliers/message.delete.success'));
+            return redirect()->route('suppliers.index')->with(
+                'success',
+                trans('admin/suppliers/message.delete.success')
+            );
        }
-
+        // Redirect to the asset management page
+        return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.assoc_users'));
    }


    /**
-    *  Get the asset information to present to the supplier view page
-    *
-    * @param  int  $assetId
-    * @return View
-    **/
-    public function getView($supplierId = null)
+     *  Get the asset information to present to the supplier view page
+     *
+     * @param null $supplierId
+     * @return \Illuminate\Contracts\View\View
+     * @internal param int $assetId
+     */
+    public function show($supplierId = null)
    {
        $supplier = Supplier::find($supplierId);

        if (isset($supplier->id)) {
-                return View::make('suppliers/view', compact('supplier'));
-        } else {
-            // Prepare the error message
-            $error = trans('admin/suppliers/message.does_not_exist', compact('id'));
-
-            // Redirect to the user management page
-            return redirect()->route('suppliers')->with('error', $error);
+                return view('suppliers/view', compact('supplier'));
        }
+        // Prepare the error message
+        $error = trans('admin/suppliers/message.does_not_exist', compact('id'));

-
+        // Redirect to the user management page
+        return redirect()->route('suppliers')->with('error', $error);
    }

-    public function getDatatable()
-    {
-        $suppliers = Supplier::with('assets', 'licenses')->select(array('id','name','address','address2','city','state','country','fax', 'phone','email','contact'))
-        ->whereNull('deleted_at');
-
-        if (Input::has('search')) {
-            $suppliers = $suppliers->TextSearch(e(Input::get('search')));
-        }
-
-        if (Input::has('offset')) {
-            $offset = e(Input::get('offset'));
-        } else {
-            $offset = 0;
-        }
-
-        if (Input::has('limit')) {
-            $limit = e(Input::get('limit'));
-        } else {
-            $limit = 50;
-        }
-
-        $allowed_columns = ['id','name','address','phone','contact','fax','email'];
-        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
-
-        $suppliers->orderBy($sort, $order);
-
-        $suppliersCount = $suppliers->count();
-        $suppliers = $suppliers->skip($offset)->take($limit)->get();
-
-        $rows = array();
-
-        foreach ($suppliers as $supplier) {
-            $actions = '<a href="'.route('update/supplier', $supplier->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/supplier', $supplier->id).'" data-content="'.trans('admin/suppliers/message.delete.confirm').'" data-title="'.trans('general.delete').' '.htmlspecialchars($supplier->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
-
-            $rows[] = array(
-                'id'                => $supplier->id,
-                'name'              => (string)link_to('admin/settings/suppliers/'.$supplier->id.'/view', e($supplier->name)),
-                'contact'           => e($supplier->contact),
-                'address'           => e($supplier->address).' '.e($supplier->address2).' '.e($supplier->city).' '.e($supplier->state).' '.e($supplier->country),
-                'phone'             => e($supplier->phone),
-                'fax'             => e($supplier->fax),
-                'email'             => ($supplier->email!='') ? '<a href="mailto:'.e($supplier->email).'">'.e($supplier->email).'</a>' : '',
-                'assets'            => $supplier->assets->count(),
-                'licenses'          => $supplier->licenses->count(),
-                'actions'           => $actions
-            );
-        }
-
-        $data = array('total' => $suppliersCount, 'rows' => $rows);
-
-        return $data;
-
-    }
 }
--- a/app/Http/Controllers/UsersController.php
+++ b/app/Http/Controllers/UsersController.php
--- a/app/Http/Controllers/ViewAssetsController.php
+++ b/app/Http/Controllers/ViewAssetsController.php
@@ -41,7 +41,6 @@ class ViewAssetsController extends Controller
    {

        $user = User::with(
-            'assets',
            'assets.model',
            'consumables',
            'accessories',
@@ -54,7 +53,7 @@ class ViewAssetsController extends Controller
        $userlog = $user->userlog->load('item', 'user', 'target');

        if (isset($user->id)) {
-            return View::make('account/view-assets', compact('user', 'userlog'));
+            return view('account/view-assets', compact('user', 'userlog'));
        } else {
            // Prepare the error message
            $error = trans('admin/users/message.user_not_found', compact('id'));
@@ -69,16 +68,16 @@ class ViewAssetsController extends Controller
    public function getRequestableIndex()
    {

-        $assets = Asset::with('model', 'defaultLoc', 'assetloc', 'assigneduser')->Hardware()->RequestableAssets()->get();
+        $assets = Asset::with('model', 'defaultLoc', 'assetloc', 'assignedTo')->Hardware()->RequestableAssets()->get();
        $models = AssetModel::with('category')->RequestableModels()->get();

-        return View::make('account/requestable-assets', compact('user', 'assets', 'models'));
+        return view('account/requestable-assets', compact('user', 'assets', 'models'));
    }

    public function getRequestedIndex()
    {
        $requestedItems = CheckoutRequest::with('user', 'requestedItem')->get();
-        return View::make('admin/requested-assets', compact('requestedItems'));
+        return view('admin/requested-assets', compact('requestedItems'));
    }


@@ -103,16 +102,16 @@ class ViewAssetsController extends Controller
        $logaction->target_id = $data['user_id'] = Auth::user()->id;
        $logaction->target_type = User::class;

-        $data['requested_by'] = $user->fullName();
+        $data['requested_by'] = $user->present()->fullName();
        $data['item_name'] = $item->name;
        $data['item_type'] = $itemType;

        if ($fullItemType == Asset::class) {
-            $data['item_url'] = route('view/hardware', $item->id);
-            $slackMessage = ' Asset <'.config('app.url').'/hardware/'.$item->id.'/view'.'|'.$item->showAssetName().'> requested by <'.config('app.url').'/users/'.$item->user_id.'/view'.'|'.$user->fullName().'>.';
+            $data['item_url'] = route('hardware.show', $item->id);
+            $slackMessage = ' Asset <'.url('/').'/hardware/'.$item->id.'/view'.'|'.$item->present()->name().'> requested by <'.url('/').'/users/'.$item->user_id.'/view'.'|'.$user->present()->fullName().'>.';
        } else {
            $data['item_url'] = route("view/${itemType}", $item->id);
-            $slackMessage = $quantity. ' ' . class_basename(strtoupper($logaction->item_type)).' <'.$data['item_url'].'|'.$item->name.'> requested by <'.config('app.url').'/user/'.$item->id.'/view'.'|'.$user->fullName().'>.';
+            $slackMessage = $quantity. ' ' . class_basename(strtoupper($logaction->item_type)).' <'.$data['item_url'].'|'.$item->name.'> requested by <'.url('/').'/user/'.$item->id.'/view'.'|'.$user->present()->fullName().'>.';
        }

        $settings = Setting::getSettings();
@@ -226,8 +225,8 @@ class ViewAssetsController extends Controller
            $logaction->target_type = User::class;
            $log = $logaction->logaction('requested');

-            $data['requested_by'] = $user->fullName();
-            $data['asset_name'] = $asset->showAssetName();
+            $data['requested_by'] = $user->present()->fullName();
+            $data['asset_name'] = $asset->present()->name();

            $settings = Setting::getSettings();

@@ -259,7 +258,7 @@ class ViewAssetsController extends Controller
                            'fields' => [
                                [
                                    'title' => 'REQUESTED:',
-                                    'value' => class_basename(strtoupper($logaction->item_type)).' asset <'.config('app.url').'/hardware/'.$asset->id.'/view'.'|'.$asset->showAssetName().'> requested by <'.config('app.url').'/hardware/'.$asset->id.'/view'.'|'.Auth::user()->fullName().'>.'
+                                    'value' => class_basename(strtoupper($logaction->item_type)).' asset <'.url('/').'/hardware/'.$asset->id.'/view'.'|'.$asset->present()->name().'> requested by <'.url('/').'/hardware/'.$asset->id.'/view'.'|'.Auth::user()->present()->fullName().'>.'
                                ]

                            ]
@@ -281,7 +280,7 @@ class ViewAssetsController extends Controller
    {
        $checkoutrequests = CheckoutRequest::all();

-        return View::make('account/requested-items', compact($checkoutrequests));
+        return view('account/requested-items', compact($checkoutrequests));
    }


@@ -315,7 +314,7 @@ class ViewAssetsController extends Controller
        } elseif (!Company::isCurrentUserHasAccess($item)) {
            return redirect()->route('requestable-assets')->with('error', trans('general.insufficient_permissions'));
        } else {
-            return View::make('account/accept-asset', compact('item'))->with('findlog', $findlog)->with('item',$item);
+            return view('account/accept-asset', compact('item'))->with('findlog', $findlog)->with('item', $item);
        }
    }

--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -14,7 +14,7 @@ class Kernel extends HttpKernel
     * @var array
     */
    protected $middleware = [
-        \MisterPhilip\MaintenanceMode\Http\Middleware\CheckForMaintenanceMode::class,
+        \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
        \Illuminate\Session\Middleware\StartSession::class,
        \Illuminate\View\Middleware\ShareErrorsFromSession::class,
        \App\Http\Middleware\FrameGuard::class,
@@ -37,10 +37,12 @@ class Kernel extends HttpKernel
            \App\Http\Middleware\VerifyCsrfToken::class,
            \App\Http\Middleware\CheckLocale::class,
            \App\Http\Middleware\CheckForTwoFactor::class,
+            \Laravel\Passport\Http\Middleware\CreateFreshApiToken::class,
        ],

        'api' => [
            'throttle:60,1',
+            'auth:api',
        ],
    ];

@@ -52,9 +54,10 @@ class Kernel extends HttpKernel
     * @var array
     */
    protected $routeMiddleware = [
-        'auth' => \App\Http\Middleware\Authenticate::class,
+        'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
        'authorize' => \App\Http\Middleware\CheckPermissions::class,
        'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
+        'can' => \Illuminate\Auth\Middleware\Authorize::class,
        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
    ];
--- a/app/Http/Middleware/CheckForDebug.php
+++ b/app/Http/Middleware/CheckForDebug.php
@@ -19,7 +19,7 @@ class CheckForDebug
        view()->share('debug_in_production', false);

        if (((Auth::check() && (Auth::user()->isSuperUser()))) && (app()->environment()=='production') && (config('app.warn_debug')===true) && (config('app.debug')===true)) {
-          view()->share('debug_in_production', true);
+            view()->share('debug_in_production', true);
        }

        return $next($request);
--- a/app/Http/Middleware/CheckForSetup.php
+++ b/app/Http/Middleware/CheckForSetup.php
@@ -22,14 +22,14 @@ class CheckForSetup
        if (Setting::setupCompleted()) {

            if ($request->is('setup*')) {
-                return redirect(config('app.url'));
+                return redirect(url('/'));
            } else {
                return $next($request);
            }

        } else {
            if (!($request->is('setup*')) && !($request->is('.env'))) {
-                return redirect(config('app.url').'/setup')->with('Request', $request);
+                return redirect(url('/').'/setup')->with('Request', $request);
            }

            return $next($request);
--- a/app/Http/Requests/AssetCheckoutRequest.php
+++ b/app/Http/Requests/AssetCheckoutRequest.php
@@ -24,7 +24,9 @@ class AssetCheckoutRequest extends Request
    public function rules()
    {
        return [
-            "assigned_to"   => 'required',
+            "assigned_user"   => 'required_without_all:assigned_asset,assigned_location',
+            "assigned_asset"   => 'required_without_all:assigned_user,assigned_location',
+            "assigned_location"   => 'required_without_all:assigned_user,assigned_asset',
        ];
    }
 }
--- a/app/Http/Requests/AssetRequest.php
+++ b/app/Http/Requests/AssetRequest.php
@@ -26,19 +26,21 @@ class AssetRequest extends Request
    public function rules()
    {
        $rules = [
-          'name'            => 'min:2|max:255',
-          'model_id'        => 'required|integer',
-          'status_id'       => 'required|integer',
-          'company_id'      => 'integer',
-          'warranty_months' => 'integer|min:0|max:240',
-          'physical'        => 'integer',
-          'checkout_date'   => 'date',
-          'checkin_date'    => 'date',
-          'supplier_id'     => 'integer',
-          'status'          => 'integer',
-          'asset_tag'       => 'required',
-          'purchase_cost'   => 'numeric',
-    
+            'name'            => 'max:255|nullable',
+            'model_id'        => 'required|integer|exists:models,id',
+            'status_id'       => 'required|integer|exists:status_labels,id',
+            'company_id'      => 'integer|nullable',
+            'warranty_months' => 'numeric|nullable',
+            'physical'        => 'integer|nullable',
+            'checkout_date'   => 'date',
+            'checkin_date'    => 'date',
+            'supplier_id'     => 'integer|nullable',
+            'status'          => 'integer|nullable',
+            'asset_tag'       => 'required',
+            'purchase_cost'   => 'numeric|nullable',
+            "assigned_user"   => 'sometimes:required_without_all:assigned_asset,assigned_location',
+            "assigned_asset"   => 'sometimes:required_without_all:assigned_user,assigned_location',
+            "assigned_location"   => 'sometimes:required_without_all:assigned_user,assigned_asset',
        ];

        $model = AssetModel::find($this->request->get('model_id'));
--- a/app/Http/Requests/ImageUploadRequest.php
+++ b/app/Http/Requests/ImageUploadRequest.php
@@ -4,7 +4,7 @@ namespace App\Http\Requests;

 use App\Http\Requests\Request;

-class UpdateUserRequest extends Request
+class ImageUploadRequest extends Request
 {
    /**
     * Determine if the user is authorized to make this request.
@@ -24,9 +24,12 @@ class UpdateUserRequest extends Request
    public function rules()
    {
        return [
-            'first_name'              => 'required|string|min:1',
-            'email'                   => 'email',
-            'password_confirm'        => 'sometimes|required_with:password',
+            'image' => 'mimes:png,gif,jpg,jpeg,svg|max:2000'
        ];
    }
+
+    public function response(array $errors)
+    {
+        return $this->redirector->back()->withInput()->withErrors($errors, $this->errorBag);
+    }
 }
--- a/app/Http/Requests/ItemImportRequest.php
+++ b/app/Http/Requests/ItemImportRequest.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Http\Requests;
+
+use App\Models\Import;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Auth;
+
+class ItemImportRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            //
+        ];
+    }
+
+    public function import(Import $import)
+    {
+        ini_set('max_execution_time', 600); //600 seconds = 10 minutes
+        ini_set('memory_limit', '500M');
+        $filename = config('app.private_uploads') . '/imports/' . $import->file_path;
+        $import->import_type = $this->input('import-type');
+        $class = title_case($import->import_type);
+        $classString = "App\\Importer\\{$class}Importer";
+        $importer = new $classString($filename);
+        $import->field_map  = request('column-mappings');
+        $import->save();
+        $fieldMappings=[];
+        if ($import->field_map) {
+            // We submit as csv field: column, but the importer is happier if we flip it here.
+            $fieldMappings = array_change_key_case(array_flip($import->field_map), CASE_LOWER);
+                        // dd($fieldMappings);
+        }
+        $importer->setCallbacks([$this, 'log'], [$this, 'progress'], [$this, 'errorCallback'])
+                 ->setUserId(Auth::id())
+                 ->setUpdating($this->has('import-update'))
+                 ->setUsernameFormat('firstname.lastname')
+                 ->setFieldMappings($fieldMappings);
+        // $logFile = storage_path('logs/importer.log');
+        // \Log::useFiles($logFile);
+        $importer->import();
+        return $this->errors;
+    }
+
+    public function log($string)
+    {
+        // \Log::Info($string);
+    }
+
+    public function progress($count)
+    {
+        // Open for future
+        return;
+    }
+    public function errorCallback($item, $field, $errorString)
+    {
+        $this->errors[$item->name][$field] = $errorString;
+    }
+
+    private $errors;
+}
--- a/app/Http/Requests/Request.php
+++ b/app/Http/Requests/Request.php
@@ -1,6 +1,7 @@
 <?php

 namespace App\Http\Requests;
+use App\Helpers\Helper;

 use Illuminate\Foundation\Http\FormRequest;

@@ -13,9 +14,15 @@ abstract class Request extends FormRequest
        return $this->rules;
    }

-    // public function response(array $errors)
-    // {
-    //     $this->session->flash('errorMessages', $errors);
-    //     return $this->redirector->back()->withErrors($errors)->withInput();
-    // }
+    public function response(array $errors)
+    {
+        if ($this->ajax() || $this->wantsJson())
+        {
+            return Helper::formatStandardApiResponse('error', null, $errors);
+        }
+
+        return $this->redirector->to($this->getRedirectUrl())
+            ->withInput($this->except($this->dontFlash))
+            ->withErrors($errors, $this->errorBag);
+    }
 }
--- a/app/Http/Requests/SaveUserRequest.php
+++ b/app/Http/Requests/SaveUserRequest.php
@@ -3,6 +3,7 @@
 namespace App\Http\Requests;

 use App\Http\Requests\Request;
+use App\Models\Setting;

 class SaveUserRequest extends Request
 {
@@ -23,12 +24,38 @@ class SaveUserRequest extends Request
     */
    public function rules()
    {
-        return [
-            'first_name'              => 'required|string|min:1',
-            'email'                   => 'email',
-            'password'                => 'required|min:6',
-            'password_confirm'        => 'sometimes|required_with:password',
-            'username'                => 'required|string|min:2|unique:users,username,NULL,deleted_at',
-        ];
+
+        $rules = [];
+
+        switch($this->method())
+        {
+
+            // Brand new asset
+            case 'POST':
+            {
+                $rules['first_name'] = 'required|string|min:1';
+                $rules['username'] = 'required|string|min:1';
+                $rules['password'] = Setting::passwordComplexityRulesSaving('store');
+            }
+
+            // Save all fields
+            case 'PUT':
+                $rules['first_name'] = 'required|string|min:1';
+                $rules['username'] = 'required|string|min:1';
+                $rules['password'] = Setting::passwordComplexityRulesSaving('update');
+
+            // Save only what's passed
+            case 'PATCH':
+            {
+                $rules['password'] = Setting::passwordComplexityRulesSaving('update');
+            }
+
+            default:break;
+        }
+
+        $rules['password_confirm'] = 'sometimes|required_with:password';
+
+        return $rules;
+
    }
 }
--- a/app/Http/Transformers/AccessoriesTransformer.php
+++ b/app/Http/Transformers/AccessoriesTransformer.php
@@ -0,0 +1,74 @@
+<?php
+namespace App\Http\Transformers;
+
+use App\Models\Accessory;
+use Gate;
+use Illuminate\Database\Eloquent\Collection;
+use App\Helpers\Helper;
+
+class AccessoriesTransformer
+{
+
+    public function transformAccessories (Collection $accessories, $total)
+    {
+        $array = array();
+        foreach ($accessories as $accessory) {
+            $array[] = self::transformAccessory($accessory);
+        }
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+    public function transformAccessory (Accessory $accessory)
+    {
+        $array = [
+            'id' => $accessory->id,
+            '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,
+            '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,
+            'notes' => ($accessory->notes) ? e($accessory->notes) : null,
+            'qty' => ($accessory->qty) ? (int) $accessory->qty : null,
+            'purchase_date' => ($accessory->purchase_date) ? Helper::getFormattedDateObject($accessory->purchase_date, 'date') : null,
+            'purchase_cost' => ($accessory->purchase_cost) ? e($accessory->purchase_cost) : null,
+            'order_number' => ($accessory->order_number) ? e($accessory->order_number) : null,
+            'min_qty' => ($accessory->min_amt) ? (int) $accessory->min_amt : null,
+            'remaining_qty' => $accessory->numRemaining(),
+            'created_at' => Helper::getFormattedDateObject($accessory->created_at, 'datetime'),
+            'updated_at' => Helper::getFormattedDateObject($accessory->updated_at, 'datetime'),
+
+        ];
+
+        $permissions_array['available_actions'] = [
+            'checkout' => Gate::allows('checkout', Accessory::class) ? true : false,
+            'checkin' =>  false,
+            'update' => Gate::allows('update', Accessory::class) ? true : false,
+            'delete' => Gate::allows('delete', Accessory::class) ? true : false,
+        ];
+
+        $permissions_array['user_can_checkout'] = false;
+
+        if ($accessory->numRemaining() > 0) {
+            $permissions_array['user_can_checkout'] = true;
+        }
+
+        $array += $permissions_array;
+
+        return $array;
+    }
+
+
+    public function transformCheckedoutAccessories (Collection $accessories_users, $total)
+    {
+
+        $array = array();
+        foreach ($accessories_users as $user) {
+            $array[] = (new UsersTransformer)->transformUser($user);
+        }
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+
+
+}
--- a/app/Http/Transformers/ActionlogsTransformer.php
+++ b/app/Http/Transformers/ActionlogsTransformer.php
@@ -0,0 +1,68 @@
+<?php
+namespace App\Http\Transformers;
+
+use App\Models\Actionlog;
+use Gate;
+use Illuminate\Database\Eloquent\Collection;
+use App\Helpers\Helper;
+
+class ActionlogsTransformer
+{
+
+    public function transformActionlogs (Collection $actionlogs, $total)
+    {
+        $array = array();
+        foreach ($actionlogs as $actionlog) {
+            $array[] = self::transformActionlog($actionlog);
+        }
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+    public function transformActionlog (Actionlog $actionlog)
+    {
+        $array = [
+            'icon'          => $actionlog->present()->icon(),
+            'item' => ($actionlog->item) ? [
+                'id' => (int) $actionlog->item->id,
+                'name' => e($actionlog->item->getDisplayNameAttribute()),
+                'type' => e($actionlog->itemType()),
+            ] : null,
+            'created_at'    => Helper::getFormattedDateObject($actionlog->created_at, 'datetime'),
+            'updated_at'    => Helper::getFormattedDateObject($actionlog->updated_at, 'datetime'),
+            'action_type'   => $actionlog->present()->actionType(),
+            'admin' => ($actionlog->user) ? [
+                'id' => (int) $actionlog->user->id,
+                'name' => e($actionlog->user->getFullNameAttribute()),
+                'first_name'=> e($actionlog->user->first_name),
+                'last_name'=> e($actionlog->user->last_name)
+            ] : null,
+            'target' => ($actionlog->target) ? [
+                'id' => (int) $actionlog->target->id,
+                'name' => ($actionlog->targetType()=='user') ? e($actionlog->target->getFullNameAttribute()) : e($actionlog->target->getDisplayNameAttribute()),
+                'type' => e($actionlog->targetType()),
+            ] : null,
+
+            'note'          => e($actionlog->note),
+
+
+        ];
+
+
+
+        return $array;
+    }
+
+
+    public function transformCheckedoutActionlog (Collection $accessories_users, $total)
+    {
+
+        $array = array();
+        foreach ($accessories_users as $user) {
+            $array[] = (new UsersTransformer)->transformUser($user);
+        }
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+
+
+}
--- a/app/Http/Transformers/AssetMaintenancesTransformer.php
+++ b/app/Http/Transformers/AssetMaintenancesTransformer.php
@@ -0,0 +1,53 @@
+<?php
+namespace App\Http\Transformers;
+
+use App\Models\AssetMaintenance;
+use Gate;
+use Illuminate\Database\Eloquent\Collection;
+use App\Helpers\Helper;
+
+class AssetMaintenancesTransformer
+{
+
+    public function transformAssetMaintenances (Collection $assetmaintenances, $total)
+    {
+        $array = array();
+        foreach ($assetmaintenances as $assetmaintenance) {
+            $array[] = self::transformAssetMaintenance($assetmaintenance);
+        }
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+    public function transformAssetMaintenance (AssetMaintenance $assetmaintenance)
+    {
+        $array = [
+            'id'            => (int) $assetmaintenance->id,
+            'asset_name'    => ($assetmaintenance->asset) ? ['id' => $assetmaintenance->asset->id,'name'=> e($assetmaintenance->asset->name)] : null,
+            'title'         => ($assetmaintenance->title) ? e($assetmaintenance->title) : null,
+            'notes'         => ($assetmaintenance->notes) ? e($assetmaintenance->notes) : null,
+            'supplier'      => ($assetmaintenance->supplier) ? ['id' => $assetmaintenance->supplier->id,'name'=> e($assetmaintenance->supplier->name)] : null,
+            'cost'          => Helper::formatCurrencyOutput($assetmaintenance->cost),
+            'asset_maintenance_type'          => e($assetmaintenance->asset_maintenance_type),
+            'start_date'         => Helper::getFormattedDateObject($assetmaintenance->start_date, 'datetime'),
+            'asset_maintenance_time'          => $assetmaintenance->asset_maintenance_time,
+            'completion_date'     => Helper::getFormattedDateObject($assetmaintenance->completion_date, 'datetime'),
+            'user_id'    => ($assetmaintenance->admin) ? ['id' => $assetmaintenance->admin->id,'name'=> e($assetmaintenance->admin->getFullNameAttribute())] : null,
+            'created_at' => Helper::getFormattedDateObject($assetmaintenance->created_at, 'datetime'),
+            'updated_at' => Helper::getFormattedDateObject($assetmaintenance->updated_at, 'datetime'),
+
+        ];
+
+        $permissions_array['available_actions'] = [
+            'delete' => (bool) Gate::allows('delete', Asset::class),
+        ];
+
+        $array += $permissions_array;
+
+        return $array;
+    }
+
+
+
+
+
+}
--- a/app/Http/Transformers/AssetModelsTransformer.php
+++ b/app/Http/Transformers/AssetModelsTransformer.php
@@ -0,0 +1,69 @@
+<?php
+namespace App\Http\Transformers;
+
+use App\Models\AssetModel;
+use Illuminate\Database\Eloquent\Collection;
+use Gate;
+use App\Helpers\Helper;
+
+class AssetModelsTransformer
+{
+
+    public function transformAssetModels (Collection $assetmodels, $total)
+    {
+        $array = array();
+        foreach ($assetmodels as $assetmodel) {
+            $array[] = self::transformAssetModel($assetmodel);
+        }
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+    public function transformAssetModel (AssetModel $assetmodel)
+    {
+
+        $array = [
+            'id' => (int) $assetmodel->id,
+            'name' => e($assetmodel->name),
+            'manufacturer' => ($assetmodel->manufacturer) ? [
+                'id' => (int) $assetmodel->manufacturer->id,
+                'name'=> e($assetmodel->manufacturer->name)
+            ]  : null,
+            'image' => ($assetmodel->image!='') ? url('/').'/uploads/models/'.e($assetmodel->image) : null,
+            'model_number' => e($assetmodel->model_number),
+            'depreciation' => ($assetmodel->depreciation) ? [
+                'id' => (int) $assetmodel->depreciation->id,
+                'name'=> e($assetmodel->depreciation->name)
+            ]  : null,
+            'assets_count' => $assetmodel->assets_count,
+            'category' => ($assetmodel->category) ? [
+                'id' => (int) $assetmodel->category->id,
+                'name'=> e($assetmodel->category->name)
+            ]  : null,
+            'fieldset' => ($assetmodel->fieldset) ? [
+                'id' => (int) $assetmodel->fieldset->id,
+                'name'=> e($assetmodel->fieldset->name)
+            ]  : null,
+            'eol' => ($assetmodel->eol > 0) ? $assetmodel->eol .' months': 'None',
+            'notes' => e($assetmodel->notes),
+            'created_at' => Helper::getFormattedDateObject($assetmodel->created_at, 'datetime'),
+            'updated_at' => Helper::getFormattedDateObject($assetmodel->updated_at, 'datetime'),
+
+        ];
+
+        $permissions_array['available_actions'] = [
+            'update' => Gate::allows('update', AssetModel::class) ? true : false,
+            'delete' => Gate::allows('delete', AssetModel::class) ? true : false,
+            'clone' => Gate::allows('create', AssetModel::class) ? true : false,
+        ];
+
+        $array += $permissions_array;
+        return $array;
+    }
+
+
+    public function transformAssetModelsDatatable($assetmodels) {
+        return (new DatatablesTransformer)->transformDatatables($assetmodels);
+    }
+
+
+}
--- a/app/Http/Transformers/AssetsTransformer.php
+++ b/app/Http/Transformers/AssetsTransformer.php
@@ -0,0 +1,133 @@
+<?php
+namespace App\Http\Transformers;
+
+use App\Models\Asset;
+use Illuminate\Database\Eloquent\Collection;
+use App\Http\Transformers\UsersTransformer;
+use Gate;
+use App\Helpers\Helper;
+
+class AssetsTransformer
+{
+    public function transformAssets(Collection $assets, $total)
+    {
+        $array = array();
+        foreach ($assets as $asset) {
+            $array[] = self::transformAsset($asset);
+        }
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+
+    public function transformAsset(Asset $asset)
+    {
+        $array = [
+            'id' => (int) $asset->id,
+            'name' => e($asset->name),
+            'asset_tag' => e($asset->asset_tag),
+            'serial' => e($asset->serial),
+            'model' => ($asset->model) ? [
+                'id' => (int) $asset->model->id,
+                'name'=> e($asset->model->name)
+            ] : null,
+            'model_number' => ($asset->model) ? e($asset->model->model_number) : null,
+            'status_label' => ($asset->assetstatus) ? [
+                'id' => (int) $asset->assetstatus->id,
+                'name'=> e($asset->assetstatus->name)
+            ] : null,
+            'category' => ($asset->model->category) ? [
+                'id' => (int) $asset->model->category->id,
+                'name'=> e($asset->model->category->name)
+            ]  : null,
+            'manufacturer' => ($asset->model->manufacturer) ? [
+                'id' => (int) $asset->model->manufacturer->id,
+                'name'=> e($asset->model->manufacturer->name)
+            ] : null,
+            'supplier' => ($asset->supplier) ? [
+                'id' => (int) $asset->supplier->id,
+                'name'=> e($asset->supplier->name)
+            ]  : null,
+            'notes' => e($asset->notes),
+            'order_number' => e($asset->order_number),
+            'company' => ($asset->company) ? [
+                'id' => (int) $asset->company->id,
+                'name'=> e($asset->company->name)
+            ] : null,
+            'location' => ($asset->assetLoc) ? [
+                'id' => (int) $asset->assetLoc->id,
+                'name'=> e($asset->assetLoc->name)
+            ]  : null,
+            'rtd_location' => ($asset->defaultLoc) ? [
+                'id' => (int) $asset->defaultLoc->id,
+                'name'=> e($asset->defaultLoc->name)
+            ]  : null,
+            'image' => ($asset->getImageUrl()) ? $asset->getImageUrl() : null,
+            'assigned_to' => ($asset->assigneduser) ? [
+                'id' => (int) $asset->assigneduser->id,
+                'username' => e($asset->assigneduser->username),
+                'name' => e($asset->assigneduser->getFullNameAttribute()),
+                'first_name'=> e($asset->assigneduser->first_name),
+                'last_name'=> e($asset->assigneduser->last_name),
+                'employee_number' =>  e($asset->assigneduser->employee_num),
+            ]  : null,
+            'warranty' =>  ($asset->warranty_months > 0) ? e($asset->warranty_months . ' ' . trans('admin/hardware/form.months')) : null,
+            'warranty_expires' => ($asset->warranty_months > 0) ?  Helper::getFormattedDateObject($asset->warranty_expires, 'date') : null,
+            'created_at' => Helper::getFormattedDateObject($asset->created_at, 'datetime'),
+            'updated_at' => Helper::getFormattedDateObject($asset->updated_at, 'datetime'),
+            'purchase_date' => Helper::getFormattedDateObject($asset->purchase_date, 'date'),
+            'last_checkout' => Helper::getFormattedDateObject($asset->last_checkout, 'datetime'),
+            'expected_checkin' => Helper::getFormattedDateObject($asset->expected_checkin, 'date'),
+            'purchase_cost' => Helper::formatCurrencyOutput($asset->purchase_cost),
+            'user_can_checkout' => (bool) $asset->availableForCheckout(),
+        ];
+
+
+        if ($asset->model->fieldset) {
+            $fields_array = array();
+            foreach ($asset->model->fieldset->fields as $field) {
+
+                if ($field->isFieldDecryptable($asset->{$field->convertUnicodeDbSlug()})) {
+                    $decrypted = \App\Helpers\Helper::gracefulDecrypt($field,$asset->{$field->convertUnicodeDbSlug()});
+                    $value = (Gate::allows('superadmin')) ? $decrypted : strtoupper(trans('admin/custom_fields/general.encrypted'));
+
+ //                   $fields_array = [$field->convertUnicodeDbSlug() => $value];
+
+
+                    $fields_array[$field->name] = [
+                            'field' => $field->convertUnicodeDbSlug(),
+                            'value' => $value
+                        ];
+
+                } else {
+                    $fields_array[$field->name] = [
+                        'field' => $field->convertUnicodeDbSlug(),
+                        'value' => $asset->{$field->convertUnicodeDbSlug()}
+                    ];
+                    //$fields_array = [$field->convertUnicodeDbSlug() => $asset->{$field->convertUnicodeDbSlug()}];
+
+
+                }
+                //array += $fields_array;
+                $array['custom_fields'] = $fields_array;
+            }
+        } else {
+            $array['custom_fields'] = array();
+        }
+
+        $permissions_array['available_actions'] = [
+            'checkout' => (bool) Gate::allows('checkout', Asset::class),
+            'checkin' => (bool) Gate::allows('checkin', Asset::class),
+            'clone' => Gate::allows('create', Asset::class) ? true : false,
+            'update' => (bool) Gate::allows('update', Asset::class),
+            'delete' => (bool) Gate::allows('delete', Asset::class),
+        ];
+
+        $array += $permissions_array;
+        return $array;
+    }
+
+    public function transformAssetsDatatable($assets)
+    {
+        return (new DatatablesTransformer)->transformDatatables($assets);
+    }
+}
--- a/app/Http/Transformers/CategoriesTransformer.php
+++ b/app/Http/Transformers/CategoriesTransformer.php
@@ -0,0 +1,55 @@
+<?php
+namespace App\Http\Transformers;
+
+use App\Models\Category;
+use Illuminate\Database\Eloquent\Collection;
+use Gate;
+use App\Helpers\Helper;
+
+class CategoriesTransformer
+{
+
+    public function transformCategories (Collection $categorys, $total)
+    {
+        $array = array();
+        foreach ($categorys as $category) {
+            $array[] = self::transformCategory($category);
+        }
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+    public function transformCategory (Category $category = null)
+    {
+        if ($category) {
+
+            $array = [
+                'id' => (int) $category->id,
+                'name' => e($category->name),
+                'type' => e($category->category_type),
+                'use_default_eula' => ($category->use_default_eula =='1') ? true : false,
+                'checkin_email' => ($category->checkin_email =='1') ? true : false,
+                'require_acceptance' => ($category->require_acceptance =='1') ? true : false,
+                'assets_count' => $category->assets_count,
+                'accessories_count' => $category->accessories_count,
+                'consumables_count' => $category->consumables_count,
+                'components_count' => $category->components_count,
+                'created_at' => Helper::getFormattedDateObject($category->created_at, 'datetime'),
+                'updated_at' => Helper::getFormattedDateObject($category->updated_at, 'datetime'),
+            ];
+
+            $permissions_array['available_actions'] = [
+                'update' => Gate::allows('update', Category::class) ? true : false,
+                'delete' => Gate::allows('delete', Category::class) ? true : false,
+            ];
+
+            $array += $permissions_array;
+
+            return $array;
+        }
+
+
+    }
+
+
+
+}
--- a/app/Http/Transformers/CompaniesTransformer.php
+++ b/app/Http/Transformers/CompaniesTransformer.php
@@ -0,0 +1,53 @@
+<?php
+namespace App\Http\Transformers;
+
+use App\Models\Company;
+use Illuminate\Database\Eloquent\Collection;
+use Gate;
+use App\Helpers\Helper;
+
+class CompaniesTransformer
+{
+
+    public function transformCompanies (Collection $companies, $total)
+    {
+        $array = array();
+        foreach ($companies as $company) {
+            $array[] = self::transformCompany($company);
+        }
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+    public function transformCompany (Company $company = null)
+    {
+        if ($company) {
+
+            $array = [
+                'id' => (int) $company->id,
+                'name' => e($company->name),
+                "created_at" => Helper::getFormattedDateObject($company->created_at, 'datetime'),
+                "updated_at" => Helper::getFormattedDateObject($company->updated_at, 'datetime'),
+                "assets_count" => (int) $company->assets_count,
+                "licenses_count" => (int) $company->licenses_count,
+                "accessories_count" => (int) $company->accessories_count,
+                "consumables_count" => (int) $company->consumables_count,
+                "components_count" => (int) $company->components_count,
+                "users_count" => (int) $company->users_count
+            ];
+
+            $permissions_array['available_actions'] = [
+                'update' => Gate::allows('update', Company::class) ? true : false,
+                'delete' => Gate::allows('delete', Company::class) ? true : false,
+            ];
+
+            $array += $permissions_array;
+
+            return $array;
+        }
+
+
+    }
+
+
+
+}
--- a/app/Http/Transformers/ComponentsAssetsTransformer.php
+++ b/app/Http/Transformers/ComponentsAssetsTransformer.php
@@ -0,0 +1,56 @@
+<?php
+namespace App\Http\Transformers;
+
+use App\Models\Asset;
+use Illuminate\Database\Eloquent\Collection;
+use App\Http\Transformers\UsersTransformer;
+use Gate;
+
+
+class ComponentsAssetsTransformer
+{
+    public function transformAssets (Collection $assets, $total)
+    {
+        $array = array();
+        foreach ($assets as $asset) {
+            $array[] = self::transformAsset($asset);
+        }
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+
+    public function transformAsset (Asset $asset)
+    {
+        $array = [
+            'id' => $asset->id,
+            'name' => e($asset->name),
+            'created_at' => $asset->created_at->format('Y-m-d'),
+            'qty' => $asset->components()->count(),
+            'user_can_checkout' => $asset->availableForCheckout(),
+        ];
+
+        $permissions_array['available_actions'] = [
+            'checkout' => Gate::allows('checkout', Asset::class) ? true : false,
+            'checkin' => Gate::allows('checkin', Asset::class) ? true : false,
+            'update' => Gate::allows('update', Asset::class) ? true : false,
+            'delete' => Gate::allows('delete', Asset::class) ? true : false,
+        ];
+
+
+
+        $array += $permissions_array;
+
+        if ($asset->model->fieldset) {
+            foreach ($asset->model->fieldset->fields as $field) {
+                $fields_array = [$field->name => $asset->{$field->convertUnicodeDbSlug()}];
+                $array += $fields_array;
+            }
+       }
+
+        return $array;
+    }
+
+    public function transformAssetsDatatable ($assets) {
+        return (new DatatablesTransformer)->transformDatatables($assets);
+    }
+}
--- a/app/Http/Transformers/ComponentsTransformer.php
+++ b/app/Http/Transformers/ComponentsTransformer.php
@@ -0,0 +1,69 @@
+<?php
+namespace App\Http\Transformers;
+
+use App\Models\Component;
+use Illuminate\Database\Eloquent\Collection;
+use App\Helpers\Helper;
+use Gate;
+
+class ComponentsTransformer
+{
+    public function transformComponents(Collection $components, $total)
+    {
+        $array = array();
+        foreach ($components as $component) {
+            $array[] = self::transformComponent($component);
+        }
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+    public function transformComponent(Component $component)
+    {
+        $array = [
+            'id' => (int) $component->id,
+            'name' => e($component->name),
+            'serial_number' => e($component->serial),
+            'location' => ($component->location) ? [
+                'id' => (int) $component->location->id,
+                'name' => e($component->location->name)
+            ] : null,
+            'qty' => ($component->qty!='') ? (int) $component->qty : null,
+            'min_amt' => ($component->min_amt!='') ? (int) $component->min_amt : null,
+            'category' => ($component->category) ? [
+                'id' => (int) $component->category->id,
+                'name' => e($component->category->name)
+            ] : null,
+            'order_number'  => e($component->order_number),
+            'purchase_date' =>  Helper::getFormattedDateObject($component->purchase_date, 'date'),
+            'purchase_cost' => Helper::formatCurrencyOutput($component->purchase_cost),
+            'remaining'  => (int) $component->numRemaining(),
+            'company'   => ($component->company) ? [
+                'id' => (int) $component->company->id,
+                'name' => e($component->company->name)
+            ] : null,
+            'created_at' => Helper::getFormattedDateObject($component->created_at, 'datetime'),
+            'updated_at' => Helper::getFormattedDateObject($component->updated_at, 'datetime'),
+            'user_can_checkout' =>  ($component->numRemaining() > 0) ? 1 : 0,
+        ];
+
+        $permissions_array['available_actions'] = [
+            'checkout' => (bool) Gate::allows('checkout', Component::class),
+            'checkin' => (bool) Gate::allows('checkin', Component::class),
+            'update' => (bool) Gate::allows('update', Component::class),
+            'delete' => (bool) Gate::allows('delete', Component::class),
+        ];
+        $array += $permissions_array;
+
+        return $array;
+    }
+
+
+    public function transformCheckedoutComponents(Collection $components_users, $total)
+    {
+        $array = array();
+        foreach ($components_users as $user) {
+            $array[] = (new UsersTransformer)->transformUser($user);
+        }
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+}
--- a/app/Http/Transformers/ConsumablesTransformer.php
+++ b/app/Http/Transformers/ConsumablesTransformer.php
@@ -0,0 +1,71 @@
+<?php
+namespace App\Http\Transformers;
+
+use App\Models\Consumable;
+use Illuminate\Database\Eloquent\Collection;
+use App\Helpers\Helper;
+use Gate;
+
+class ConsumablesTransformer
+{
+
+    public function transformConsumables (Collection $consumables, $total)
+    {
+        $array = array();
+        foreach ($consumables as $consumable) {
+            $array[] = self::transformConsumable($consumable);
+        }
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+    public function transformConsumable (Consumable $consumable)
+    {
+        $array = [
+            'id'            => (int) $consumable->id,
+            'category'      => ($consumable->category) ? ['id' => $consumable->category->id, 'name' => e($consumable->category->name)] : null,
+            'company'   => ($consumable->company) ? ['id' => (int) $consumable->company->id, 'name' => e($consumable->company->name)] : null,
+            'item_no'       => e($consumable->item_no),
+            'location'      => ($consumable->location) ? ['id' => (int) $consumable->location->id, 'name' => e($consumable->location->name)] : null,
+            'manufacturer'  => ($consumable->manufacturer) ? ['id' => (int) $consumable->manufacturer->id, 'name' => e($consumable->manufacturer->name)] : null,
+            'min_amt'       => (int) $consumable->min_amt,
+            'model_number'  => e($consumable->model_number),
+            'name'          => e($consumable->name),
+            'remaining'  => $consumable->numRemaining(),
+            'order_number'  => e($consumable->order_number),
+            'purchase_cost'  => Helper::formatCurrencyOutput($consumable->purchase_cost),
+            'purchase_date'  => Helper::getFormattedDateObject($consumable->purchase_date, 'date'),
+            'qty'           => (int) $consumable->qty,
+            'created_at' => Helper::getFormattedDateObject($consumable->created_at, 'datetime'),
+            'updated_at' => Helper::getFormattedDateObject($consumable->updated_at, 'datetime'),
+        ];
+
+        $permissions_array['user_can_checkout'] = false;
+
+        if ($consumable->numRemaining() > 0) {
+            $permissions_array['user_can_checkout'] = true;
+        }
+
+        $permissions_array['available_actions'] = [
+            'checkout' => Gate::allows('checkout', Consumable::class) ? true : false,
+            'checkin' => Gate::allows('checkin', Consumable::class) ? true : false,
+            'update' => Gate::allows('update', Consumable::class) ? true : false,
+            'delete' => Gate::allows('delete', Consumable::class) ? true : false,
+        ];
+        $array += $permissions_array;
+        return $array;
+    }
+
+
+    public function transformCheckedoutConsumables (Collection $consumables_users, $total)
+    {
+
+        $array = array();
+        foreach ($consumables_users as $user) {
+            $array[] = (new UsersTransformer)->transformUser($user);
+        }
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+
+
+}
--- a/app/Http/Transformers/CustomFieldsTransformer.php
+++ b/app/Http/Transformers/CustomFieldsTransformer.php
@@ -0,0 +1,36 @@
+<?php
+namespace App\Http\Transformers;
+
+use App\Models\CustomField;
+use Illuminate\Database\Eloquent\Collection;
+use App\Helpers\Helper;
+use Gate;
+
+class CustomFieldsTransformer
+{
+
+    public function transformCustomFields (Collection $fields, $total)
+    {
+        $array = array();
+        foreach ($fields as $field) {
+            $array[] = self::transformCustomField($field);
+        }
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+    public function transformCustomField (CustomField $field)
+    {
+
+        $array = [
+            'name' => e($field->name),
+            'db_column_name' => e($field->db_column_name()),
+            'format'   =>  e($field->format),
+            'required'   =>  $field->pivot->required,
+            'created_at' => Helper::getFormattedDateObject($field->created_at, 'datetime'),
+            'updated_at' => Helper::getFormattedDateObject($field->updated_at, 'datetime'),
+        ];
+        return $array;
+    }
+
+
+}
--- a/app/Http/Transformers/CustomFieldsetsTransformer.php
+++ b/app/Http/Transformers/CustomFieldsetsTransformer.php
@@ -0,0 +1,47 @@
+<?php
+namespace App\Http\Transformers;
+
+use App\Models\CustomFieldset;
+use App\Models\CustomField;
+use App\Models\AssetModel;
+use Illuminate\Database\Eloquent\Collection;
+use App\Helpers\Helper;
+use Gate;
+
+class CustomFieldsetsTransformer
+{
+
+    public function transformCustomFieldsets (Collection $fieldsets, $total)
+    {
+        $array = array();
+        foreach ($fieldsets as $fieldset) {
+            $array[] = self::transformCustomFieldset($fieldset);
+        }
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+    public function transformCustomFieldset (CustomFieldset $fieldset)
+    {
+        $fields = $fieldset->fields;
+        $models = $fieldset->models;
+        $modelsArray = array();
+
+        foreach ($models as $model)
+        {
+            $modelsArray[] = [
+              'id' => $model->id,
+              'name' => e($model->name)
+            ];
+        }
+
+        $array = [
+            'id' => (int) $fieldset->id,
+            'name' => e($fieldset->name),
+            'fields' => (new CustomFieldsTransformer)->transformCustomFields($fields, $fieldset->fields_count),
+            'models' => (new DatatablesTransformer)->transformDatatables($modelsArray, $fieldset->models_count),
+            'created_at' => Helper::getFormattedDateObject($fieldset->created_at, 'datetime'),
+            'updated_at' => Helper::getFormattedDateObject($fieldset->updated_at, 'datetime'),
+        ];
+        return $array;
+    }
+}
--- a/app/Http/Transformers/DatatablesTransformer.php
+++ b/app/Http/Transformers/DatatablesTransformer.php
@@ -0,0 +1,16 @@
+<?php
+namespace App\Http\Transformers;
+
+use App\Models\Location;
+
+
+class DatatablesTransformer
+{
+
+    public function transformDatatables($objects, $total = null)
+    {
+        (isset($total)) ? $objects_array['total'] = $total : $objects_array['total'] = count($objects);
+        $objects_array['rows'] = $objects;
+        return $objects_array;
+    }
+}
--- a/app/Http/Transformers/DepartmentsTranformer.php
+++ b/app/Http/Transformers/DepartmentsTranformer.php
@@ -0,0 +1,62 @@
+<?php
+namespace App\Http\Transformers;
+
+use App\Models\Department;
+use Illuminate\Database\Eloquent\Collection;
+use Gate;
+use App\Helpers\Helper;
+
+class DepartmentsTransformer
+{
+
+    public function transformDepartments (Collection $departments, $total)
+    {
+        $array = array();
+        foreach ($departments as $department) {
+            $array[] = self::transformDepartment($department);
+        }
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+    public function transformDepartment (Department $department = null)
+    {
+        if ($department) {
+
+            $array = [
+                'id' => (int) $department->id,
+                'name' => e($department->name),
+                'company' => ($department->company) ? [
+                    'id' => (int) $department->company->id,
+                    'name'=> e($department->company->name)
+                ] : null,
+                'manager' => ($department->manager) ? [
+                    'id' => (int) $department->manager->id,
+                    'name' => e($department->manager->getFullNameAttribute()),
+                    'first_name'=> e($department->manager->first_name),
+                    'last_name'=> e($department->manager->last_name)
+                ] : null,
+                'location' => ($department->location) ? [
+                    'id' => (int) $department->location->id,
+                    'name' => e($department->location->name)
+                ] : null,
+                'users_count' => e($department->users_count),
+                'created_at' => Helper::getFormattedDateObject($department->created_at, 'datetime'),
+                'updated_at' => Helper::getFormattedDateObject($department->updated_at, 'datetime'),
+            ];
+
+            $permissions_array['available_actions'] = [
+                'update' => Gate::allows('update', Department::class) ? true : false,
+                'delete' => Gate::allows('delete', Department::class) ? true : false,
+            ];
+
+            $array += $permissions_array;
+
+            return $array;
+        }
+
+
+    }
+
+
+
+}
--- a/Show More
+++ b/Show More