Bumped version

One more try on #4001
Bumped build number
2017-09-25 22:10:06 -07:00 · 2017-09-25 22:05:57 -07:00 · 2017-09-25 21:57:16 -07:00 · 2017-09-25 21:50:41 -07:00 · 2017-09-25 21:40:43 -07:00 · 2017-09-25 20:45:05 -07:00
8822 changed files with 948649 additions and 147545 deletions
@@ -0,0 +1,751 @@
+{
+  "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"
+      ]
+    },
+    {
+      "login": "imanghafoori1",
+      "name": "Iman",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/6961695?v=4",
+      "profile": "https://github.com/imanghafoori1",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "richardhofman6",
+      "name": "Richard Hofman",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/6551003?v=4",
+      "profile": "https://github.com/richardhofman6",
+      "contributions": [
+        "code"
+      ]
+    }
+  ]
+}
@@ -0,0 +1,96 @@
+# --------------------------------------------
+# REQUIRED: BASIC APP SETTINGS
+# --------------------------------------------
+APP_ENV=production
+APP_DEBUG=false
+APP_KEY=ChangeMe
+APP_URL=null
+APP_TIMEZONE='UTC'
+APP_LOCALE=en
+
+
+# --------------------------------------------
+# REQUIRED: DATABASE SETTINGS
+# --------------------------------------------
+DB_CONNECTION=mysql
+DB_HOST=localhost
+DB_DATABASE=null
+DB_USERNAME=null
+DB_PASSWORD=null
+DB_PREFIX=null
+DB_DUMP_PATH='/usr/bin'
+
+# --------------------------------------------
+# OPTIONAL: SSL DATABASE SETTINGS
+# --------------------------------------------
+DB_SSL=false
+DB_SSL_KEY_PATH=null
+DB_SSL_CERT_PATH=null
+DB_SSL_CA_PATH=null
+DB_SSL_CIPHER=null
+
+
+# --------------------------------------------
+# REQUIRED: OUTGOING MAIL SERVER SETTINGS
+# --------------------------------------------
+MAIL_DRIVER=smtp
+MAIL_HOST=email-smtp.us-west-2.amazonaws.com
+MAIL_PORT=587
+MAIL_USERNAME=YOURUSERNAME
+MAIL_PASSWORD=YOURPASSWORD
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDR=you@example.com
+MAIL_FROM_NAME='Snipe-IT'
+MAIL_REPLYTO_ADDR=you@example.com
+MAIL_REPLYTO_NAME='Snipe-IT'
+
+
+# --------------------------------------------
+# REQUIRED: IMAGE LIBRARY
+# This should be gd or imagick
+# --------------------------------------------
+IMAGE_LIB=gd
+
+
+# --------------------------------------------
+# OPTIONAL: SESSION SETTINGS
+# --------------------------------------------
+SESSION_LIFETIME=12000
+EXPIRE_ON_CLOSE=false
+ENCRYPT=false
+COOKIE_NAME=snipeit_session
+COOKIE_DOMAIN=null
+SECURE_COOKIES=false
+
+
+# --------------------------------------------
+# OPTIONAL: CACHE SETTINGS
+# --------------------------------------------
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+QUEUE_DRIVER=sync
+
+
+# --------------------------------------------
+# OPTIONAL: AWS S3 SETTINGS
+# --------------------------------------------
+AWS_SECRET=null
+AWS_KEY=null
+AWS_REGION=null
+AWS_BUCKET=null
+
+# --------------------------------------------
+# OPTIONAL: LOGIN THROTTLING
+# --------------------------------------------
+LOGIN_MAX_ATTEMPTS=5
+LOGIN_LOCKOUT_DURATION=60
+
+# --------------------------------------------
+# OPTIONAL: MISC
+# --------------------------------------------
+APP_LOG=single
+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
@@ -0,0 +1,72 @@
+# --------------------------------------------
+# REQUIRED: BASIC APP SETTINGS
+# --------------------------------------------
+APP_ENV=testing
+APP_DEBUG=true
+APP_KEY=base64:glJpcM7BYwWiBggp3SQ/+NlRkqsBQMaGEOjemXqJzOU=
+APP_URL=http://localhost:8000
+APP_TIMEZONE='US/Pacific'
+APP_LOCALE=en
+FILESYSTEM_DISK=local
+
+# --------------------------------------------
+# REQUIRED: DATABASE SETTINGS
+# --------------------------------------------
+DB_CONNECTION=sqlite_testing
+DB_HOST=localhost
+DB_DATABASE=testing.sqlite
+DB_USERNAME=null
+DB_PASSWORD=null
+
+# --------------------------------------------
+# REQUIRED: OUTGOING MAIL SERVER SETTINGS
+# --------------------------------------------
+MAIL_DRIVER=log
+MAIL_HOST=email-smtp.us-west-2.amazonaws.com
+MAIL_PORT=587
+MAIL_USERNAME=YOURUSERNAME
+MAIL_PASSWORD=YOURPASSWORD
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDR=you@example.com
+MAIL_FROM_NAME=Snipe-IT
+
+# --------------------------------------------
+# REQUIRED: IMAGE LIBRARY
+# This should be gd or imagick
+# --------------------------------------------
+IMAGE_LIB=gd
+
+
+# --------------------------------------------
+# OPTIONAL: AWS S3 SETTINGS
+# --------------------------------------------
+AWS_SECRET=null
+AWS_KEY=null
+AWS_REGION=null
+AWS_BUCKET=null
+
+
+# --------------------------------------------
+# OPTIONAL: CACHE SETTINGS
+# --------------------------------------------
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+QUEUE_DRIVER=sync
+
+
+# --------------------------------------------
+# OPTIONAL: SESSION SETTINGS
+# --------------------------------------------
+SESSION_LIFETIME=12000
+EXPIRE_ON_CLOSE=false
+ENCRYPT=false
+COOKIE_NAME=snipeittest_session
+COOKIE_DOMAIN=null
+SECURE_COOKIES=false
+
+
+# --------------------------------------------
+# OPTIONAL: APP LOG FORMAT
+# --------------------------------------------
+APP_LOG=single
+APP_LOG_LEVEL=debug
@@ -0,0 +1,71 @@
+# --------------------------------------------
+# REQUIRED: BASIC APP SETTINGS
+# --------------------------------------------
+APP_ENV=testing-ci
+APP_DEBUG=true
+APP_KEY=ChangeMe
+APP_URL=http://localhost:8000
+APP_TIMEZONE='US/Pacific'
+APP_LOCALE=en
+FILESYSTEM_DISK=local
+
+# --------------------------------------------
+# REQUIRED: DATABASE SETTINGS
+# --------------------------------------------
+DB_CONNECTION=mysql
+DB_HOST=localhost
+DB_DATABASE=snipeit_unit
+DB_USERNAME=root
+DB_PASSWORD=null
+
+# --------------------------------------------
+# REQUIRED: OUTGOING MAIL SERVER SETTINGS
+# --------------------------------------------
+MAIL_DRIVER=log
+MAIL_HOST=email-smtp.us-west-2.amazonaws.com
+MAIL_PORT=587
+MAIL_USERNAME=YOURUSERNAME
+MAIL_PASSWORD=YOURPASSWORD
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDR=you@example.com
+MAIL_FROM_NAME=Snipe-IT
+
+# --------------------------------------------
+# REQUIRED: IMAGE LIBRARY
+# This should be gd or imagick
+# --------------------------------------------
+IMAGE_LIB=gd
+
+
+# --------------------------------------------
+# OPTIONAL: AWS S3 SETTINGS
+# --------------------------------------------
+AWS_SECRET=null
+AWS_KEY=null
+AWS_REGION=null
+AWS_BUCKET=null
+
+
+# --------------------------------------------
+# OPTIONAL: CACHE SETTINGS
+# --------------------------------------------
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+QUEUE_DRIVER=sync
+
+
+# --------------------------------------------
+# OPTIONAL: SESSION SETTINGS
+# --------------------------------------------
+SESSION_LIFETIME=12000
+EXPIRE_ON_CLOSE=false
+ENCRYPT=false
+COOKIE_NAME=snipeittest_session
+COOKIE_DOMAIN=null
+SECURE_COOKIES=false
+
+
+# --------------------------------------------
+# OPTIONAL: APP LOG FORMAT
+# --------------------------------------------
+APP_LOG=single
@@ -0,0 +1,22 @@
+APP_ENV=testing
+APP_DEBUG=true
+APP_URL=http://snipe-it.localapp
+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
@@ -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
@@ -0,0 +1,31 @@
+#### Expected Behavior (or desired behavior if a feature request)
+
+(what you expect to happen goes here)
+
+-----
+
+#### Actual Behavior
+
+(what actually happens goes here)
+
+-----
+
+#### Please confirm you have done the following before posting your bug report:
+
+- [ ] I have enabled debug mode
+- [ ] I have read [checked the Common Issues page](https://snipe-it.readme.io/docs/common-issues)
+
+-----
+#### Please provide answers to these questions before posting your bug report:
+
+- Version of Snipe-IT you're running
+- What OS and web server you're running Snipe-IT on
+- What method you used to install Snipe-IT (install.sh, manual installation, docker, etc)
+- WITH DEBUG TURNED ON, if you're getting an error in your browser, include that error
+- What specific Snipe-IT page you're on, and what specific element you're interacting with to trigger the error
+- If a stacktrace is provided in the error, include that too.
+- Any errors that appear in your browser's error console.
+- Confirm whether the error is [reproduceable on the demo](https://snipeitapp.com/demo).
+- Include any additional information you can find in `app/storage/logs` and your webserver's logs.
+- Include what you've done so far in the installation, and if you got any error messages along the way.
+- Indicate whether or not you've manually edited any data directly in the database
@@ -1,33 +1,44 @@
-/bootstrap/compiled.php
-/vendor
-composer.phar
+.couscous
 .DS_Store
-/app/config/database.php
-/app/config/mail.php
-/app/database/*.sqlite
-/app/storage/meta/services.json
-/app/config/*/mail.php
-/app/config/*/session.php
-/app/config/*/database.php
-/app/config/*/app.php
-public/packages/*
-public/uploads/models/*
-public/uploads/avatars/*
-/app/storage/views/*
-/app/storage/logs/*
-/app/storage/debugbar/
-/bin/
+.env
 .idea
+/bin/
+/bootstrap/compiled.php
+/node_modules
+/vendor
+app/database/*.sqlite
+app/storage/meta/services.json
+composer.phar
 crowdin.yaml
+Homestead.json
+Homestead.yaml
+output
+phpDocumentor.phar
+public/uploads/*.gif
+public/uploads/barcodes/*.png
+public/uploads/*.jpg
+public/uploads/*.png
+public/uploads/*.svg
+public/uploads/*.tif
+public/uploads/assets/*
+public/uploads/avatars/*
 public/uploads/logo.gif
 public/uploads/logo.png
-.siteflow
-public/assets/.siteflow
-app/config/local/session.php
-.couscous
-tests/_support/_generated/*
+public/uploads/logo.svg
+public/uploads/models/*
+public/uploads/suppliers/*
+public/uploads/users/*
+storage/app/private_uploads/users/*
+storage/debugbar/
+storage/dumps/*
+storage/laravel-backups
+storage/logs/*
+storage/private_uploads/users/*
 tests/_data/scenarios
-nbproject/*
-app/config/local/ldap.php
-app/storage/dumps/*
-app/config/packages/schickling/backup/config.php
+tests/_output/*
+tests/_support/_generated/*
+/npm-debug.log
+/storage/oauth-private.key
+/storage/oauth-public.key
+
+*.cache
@@ -0,0 +1,11 @@
+<IfModule mod_rewrite.c>
+    <IfModule mod_negotiation.c>
+        Options -MultiViews
+    </IfModule>
+
+    # Make sure .env files not not browseable if in a sub-directory.
+    <FilesMatch "\.env$">
+    Deny from all
+    </FilesMatch>
+    
+</IfModule>
@@ -1,40 +1,61 @@
 addons:
    hosts:
-        - snipe-it.dev
+        - localhost
 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.4
-  - 5.5
  - 5.6
-
-# optionally specify a list of environments, for example to test different RDBMS
-env:
-  - DB=mysql
+  - 7.0

 # execute any number of scripts before the test run, custom env's are available as variables
 before_script:
-  - if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS snipeit_unit;" -utravis; fi
-  - curl -s http://getcomposer.org/installer | php
-  - cp app/config/testing/app.example.php app/config/testing/app.php
-  - cp app/config/testing/database.example.php app/config/testing/database.php
-  - cp app/config/testing/mail.example.php app/config/testing/mail.php
+  - phantomjs --webdriver=4444  &
+  - 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 --prefer-source --no-interaction
-  - php artisan key:generate --env=testing
-  - php artisan migrate:install --env=testing --no-interaction -vvv
-  - php artisan migrate --package cartalyst/sentry --env=testing --no-interaction -vvv
-  - php artisan migrate --env=testing --no-interaction -vvv
-  - php artisan db:seed --env=testing --no-interaction -vvv
+  - composer install -n --prefer-source
+  - chmod -R 777 storage
+  - php artisan migrate --env=testing-ci --database=mysql --force
+  - ./vendor/bin/codecept build
+  - 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
+
+

 # omitting "script:" will default to phpunit
 # use the $DB env variable to determine the phpunit.xml to use
-# script: ./vendor/bin/codecept run
-script: phpunit
+# 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/*.fail.html
+  - curl http://localhost:8000/login
+  - cat storage/logs/laravel.log

 # configure notifications (email, IRC, campfire etc)
 notifications:
@@ -1,967 +0,0 @@
-
-
-###  v1.2.6.1 - Released Mar 12, 2015 08:25:28
-* <a href="http://github.com/snipe/snipe-it/commit/7047af44f6544d2eeed0f0fcefdbdd44489f189a">view</a> &bull; Fixed layout for remember me button
-* <a href="http://github.com/snipe/snipe-it/commit/4502582beb064ffeee4a1cdf892f513e58534014">view</a> &bull; Trying to fix pre-commit hook :(
-* <a href="http://github.com/snipe/snipe-it/commit/61b04d6e40baa9054e1701455259d8d62fa868ff">view</a> &bull; Fixes #579 - user cannot accept more than once
-* <a href="http://github.com/snipe/snipe-it/commit/2d196b1595ec87f119ad5a82f8f676918c52c896">view</a> &bull; Fixes #602 for strict_mode
-* <a href="http://github.com/snipe/snipe-it/commit/2540e90c37f37515d8d0277a4152c4b8198a4222">view</a> &bull; Fixes #605 - hides user requestable view from admins
-* <a href="http://github.com/snipe/snipe-it/commit/1c333e4a24a4950418175a8c354d7541637b7658">view</a> &bull; Fixes #596 - better routes for checking in multiple items from user
-* <a href="http://github.com/snipe/snipe-it/commit/7d5ee9750f912d85ac0c7f42e2beaba7e026989c">view</a> &bull; Added #596 fix for accessories
-* <a href="http://github.com/snipe/snipe-it/commit/3f9d9f23d5190052deb1f36be919c650e8f773b8">view</a> &bull; Fixes #280 - updated link to use config url
-* <a href="http://github.com/snipe/snipe-it/commit/817384b7615a301d6d692aefe6e41cd92ecfd6e1">view</a> &bull; Fixes #597 - print-friendly view on users
-* <a href="http://github.com/snipe/snipe-it/commit/2115c82587e06049245f17f9d710fbc7a61e57b9">view</a> &bull; Fixed DB format for nullable EULA
-* <a href="http://github.com/snipe/snipe-it/commit/f62f22b4bf1399c3b98041dfe17f4cc8450847b2">view</a> &bull; ref #599. showing groups in user detail view. fixes a small design bug with group edit view
-* <a href="http://github.com/snipe/snipe-it/commit/ad25c048c4a52a7f80a479a3b7d621aaad18b1d7">view</a> &bull; Updated Sentry version to fix #625
-* <a href="http://github.com/snipe/snipe-it/commit/d31c12cfafb2ba323973964215f033bd9aeb1f9b">view</a> &bull; Merge pull request #629 from uberbrady/unicode_fix
-* <a href="http://github.com/snipe/snipe-it/commit/33dd59fb814089c81886c0264b2356df2b212864">view</a> &bull; Fix #637 - Remove Deleted Models from drop down
-* <a href="http://github.com/snipe/snipe-it/commit/cb171bcac5c4ccbb347f370e3d2b28783378c0b2">view</a> &bull; Fixes #645 - adds zip and rar to filetype
-
-
-###  v1.2.6 - Released Feb 28, 2015 08:27:45
-
-
-###  v1.2.6-beta - Released Feb 27, 2015 03:17:06
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/30df21c7aa2582bc3b1efbfd788c1aea2733aa7d">view</a> &bull; Fixed missing checkedout-to info on asset view
-* <a href="http://github.com/snipe/snipe-it/commit/70ae59ed6260101bcfb6e3cbd6309ecb9c1c935a">view</a> &bull; Fixed a bug when no assets are in table that the autoincrement method blows up. Also optimzed the logic to get max id instead of popping top off creation date.
-* <a href="http://github.com/snipe/snipe-it/commit/f8e12cabd4af8875abd759a3c9d6c2216cb88601">view</a> &bull; Fixes #476 - added logo upload and header color
-* <a href="http://github.com/snipe/snipe-it/commit/f85061f988a946f1d4a284fbfc8c442636c1364c">view</a> &bull; Fix #541 - Headers not being skipped if checked
-* <a href="http://github.com/snipe/snipe-it/commit/8b3e22b58e080b44e4de809b8598283fa6ba5bb0">view</a> &bull; Fixes #546 - only insert data if values exist
-* <a href="http://github.com/snipe/snipe-it/commit/083cb1b5ec51aa2b6932a59b9436a1a45fad5460">view</a> &bull; Fix activate for strict db
-* <a href="http://github.com/snipe/snipe-it/commit/35cf5b3d609fec2bc3613bdae42d338448413520">view</a> &bull; Fixes #423
-* <a href="http://github.com/snipe/snipe-it/commit/097bb38a231795aa52ff772a38887700e828256d">view</a> &bull; Fixes #163 - accept acceptance + eula
-* <a href="http://github.com/snipe/snipe-it/commit/b2af455523fcca1bb02018b38fdb6dc4861819d8">view</a> &bull; Merge conflict resolution. Added a use at the same line as remote. Fixed
-* <a href="http://github.com/snipe/snipe-it/commit/8879bff16084b2cfa0280fcb1f83d3f90368797f">view</a> &bull; Fixed bug for reporting on upload in dashboard
-* <a href="http://github.com/snipe/snipe-it/commit/3135869d5a3fafcf70e49dcbb99e36c2ec04ddd0">view</a> &bull; Fixed font path
-* <a href="http://github.com/snipe/snipe-it/commit/a5a1c4223b357b9cc2751a28e0c4e3085e476733">view</a> &bull; Fixed chevrons
-* <a href="http://github.com/snipe/snipe-it/commit/734dc49564e4f970846f786177c9d2928284fb5f">view</a> &bull; Fixed icon
-* <a href="http://github.com/snipe/snipe-it/commit/a6232cbfd8050ace613259df56afae243954c625">view</a> &bull; Fix language string for create accessory
-* <a href="http://github.com/snipe/snipe-it/commit/c2bbc1281ccdda65caa55665c66c78613142099f">view</a> &bull; Mobile fixes
-* <a href="http://github.com/snipe/snipe-it/commit/29863004e2e622a9b3b4616abdcd92f2b950bebe">view</a> &bull; more small mobile fixes
-* <a href="http://github.com/snipe/snipe-it/commit/8eaa70c39b3ace90a517387dc91f452aede18958">view</a> &bull; Fixes #567 - bug in depreciation report csv export
-* <a href="http://github.com/snipe/snipe-it/commit/e41621def05994302627cd4a6a81abd8e43c86be">view</a> &bull; Fixed relation between accessory and category
-* <a href="http://github.com/snipe/snipe-it/commit/9f3edd701b51a7aecf792e5736534c1bb15aca9a">view</a> &bull; Fixes #565 - Soft Delete Models and Allow Restore
-* <a href="http://github.com/snipe/snipe-it/commit/528c06cf7fb4f5c35d4b90eb256c0d195b8366b7">view</a> &bull; Reverting icon fix
-* <a href="http://github.com/snipe/snipe-it/commit/1ac401f0c036eca0cec1df0986d4c7e1903556fa">view</a> &bull; Fixed EULA mail
-* <a href="http://github.com/snipe/snipe-it/commit/6d16c97902dadad2351b627f3157257774a075f3">view</a> &bull; Fixed back arrow
-* <a href="http://github.com/snipe/snipe-it/commit/3e189d3502f8147c012b641cc366394875e9005c">view</a> &bull; Fixes #538 - sortable tables
-* <a href="http://github.com/snipe/snipe-it/commit/31df29cac878deeb75d8b9b5a2efc7c84ef4b592">view</a> &bull; Fixed funky layout from datatables
-* <a href="http://github.com/snipe/snipe-it/commit/efaf067b948899d0b784f47092dc3bc22fe504ca">view</a> &bull; Fixed user relationship
-* <a href="http://github.com/snipe/snipe-it/commit/5010720a976019306e37b89f5aa0e917c0ffdea3">view</a> &bull; Fixed accessory relationship
-* <a href="http://github.com/snipe/snipe-it/commit/a20e1f6943eab11fc937fcfeb3fe99dc0d520734">view</a> &bull; Fixed attach to relation
-* <a href="http://github.com/snipe/snipe-it/commit/19ad8970d76a1676de3494b758efa65c0ed6a5c1">view</a> &bull; Fixed arrow icon
-* <a href="http://github.com/snipe/snipe-it/commit/430b8233ed6f23402597fe54215b9988a3405dd7">view</a> &bull; Fixed user relationship
-* <a href="http://github.com/snipe/snipe-it/commit/c0c563b1c77ff9942212af89384c8ded40b83b29">view</a> &bull; Fixes accessory relationshop for pivot
-* <a href="http://github.com/snipe/snipe-it/commit/ef6eae63d86f159a170c3a322a44e08bab827080">view</a> &bull; Fixed error icon
-* <a href="http://github.com/snipe/snipe-it/commit/d33dcbbcb12172527cec977f679198f594ac975b">view</a> &bull; Fixed bad method call in accessories on delete
-* <a href="http://github.com/snipe/snipe-it/commit/04735f1affd2fdff9d6cf96ed583ece895cfb341">view</a> &bull; Fixed assetlog display
-* <a href="http://github.com/snipe/snipe-it/commit/c484afb12b0720eaba2d28f501bf547e2ad9caa9">view</a> &bull; Fixed typo for accessories accept
-
-
-###  v1.2.5 - Released Feb 18, 2015 03:18:10
-* <a href="http://github.com/snipe/snipe-it/commit/00f7717142e11b90764ffce2d554c566f8ad219f">view</a> &bull; Fix #475 and styling
-* <a href="http://github.com/snipe/snipe-it/commit/49f25a23a99c08606d58101e039a885b89503fa7">view</a> &bull; Merge pull request #516 from splaer/fix-475
-* <a href="http://github.com/snipe/snipe-it/commit/58ff929d7193b054073ef46ae2fafdef51d51919">view</a> &bull; Fixes error when no model present because new asset
-* <a href="http://github.com/snipe/snipe-it/commit/f57c61dd4d789635cee6f62899807b1a7928800e">view</a> &bull; Possible fix for #518 - license count issue
-* <a href="http://github.com/snipe/snipe-it/commit/064c0211dbb310d1dfdb126e3ce2cee72a80f628">view</a> &bull; Fix #517 - User Requestable Assets
-* <a href="http://github.com/snipe/snipe-it/commit/4a5007264e1712250726047162df91041d12d28c">view</a> &bull; Fixed mac address not showing
-* <a href="http://github.com/snipe/snipe-it/commit/17258b73a1c09918960d894702a0ae341a18f0b8">view</a> &bull; Fixes #520 - state no longer required
-* <a href="http://github.com/snipe/snipe-it/commit/f40bb7b8b3a17ff772c797a3f91a845b068be3d2">view</a> &bull; Fixes #520 postal code requirement
-* <a href="http://github.com/snipe/snipe-it/commit/08ee02d0cd4d1ff9ed2b0600b75390c1e34c1f53">view</a> &bull; Fixes #525 - added serial to asset model UI
-* <a href="http://github.com/snipe/snipe-it/commit/24f5cdc743acd55ead02282e13e07f3cbd3551b0">view</a> &bull; Fixes #523 - added file uploads to assets
-* <a href="http://github.com/snipe/snipe-it/commit/e02bea4275306fb3d2696e3018066b4b1486fa8d">view</a> &bull; Fixes #457 - added bulk options to hardware
-* <a href="http://github.com/snipe/snipe-it/commit/4e4144ea749974332f645fa77eb74fbbfef51b90">view</a> &bull; Fixed blade reference
-* <a href="http://github.com/snipe/snipe-it/commit/b32d74de57a3a26326a220236838f57550549ca5">view</a> &bull; Fixed seeder with duplicate ID
-* <a href="http://github.com/snipe/snipe-it/commit/ea6a6d098ad1795fc5463c61b72240cdcd8a43e7">view</a> &bull; Fixes #440 - removed unique constraint on serial
-* <a href="http://github.com/snipe/snipe-it/commit/38961298ed6efe3649fdbf4b1e9b3278ab85567a">view</a> &bull; Fixes #439 - loads javascript and CSS locally
-* <a href="http://github.com/snipe/snipe-it/commit/063e5c407c8f817c16026887be16eeb42598417f">view</a> &bull; Fixed the depreciation report, fixes to calculate current depreciated value (which were only used there). Additional fixes and refactoring around Depreciable, in terms of how assets get depreciation via models, and licenses get depreciation directly.
-
-
-###  v1.2.4 - Released Feb 12, 2015 06:57:47
-* <a href="http://github.com/snipe/snipe-it/commit/2277b6ee699a78108523eee11695a280e76b1bb4">view</a> &bull; Fixed checkout logic for new assigned_to
-* <a href="http://github.com/snipe/snipe-it/commit/dbc93de6b3966470f83254547f8029c60f489490">view</a> &bull; Fixes checkin button on view
-* <a href="http://github.com/snipe/snipe-it/commit/c06a4d4118039d112b69e48f9d4efc2be796f2e0">view</a> &bull; Fixed wonky checkin/checkout buttons
-* <a href="http://github.com/snipe/snipe-it/commit/31f4ba88f655e1386f2f4f0efae84399f7aa6d52">view</a> &bull; Fix RTD query to not display checked out asset
-* <a href="http://github.com/snipe/snipe-it/commit/5867c604104781c351f870ff3e0fd4b4d6eeb35a">view</a> &bull; Fixed scope chaining on assigned_to
-* <a href="http://github.com/snipe/snipe-it/commit/a2178392e65bcc35594d516a20f67eea8466e5c1">view</a> &bull; Fixed seeder
-* <a href="http://github.com/snipe/snipe-it/commit/7715731c4a2e423afb94873227eb728ad4877221">view</a> &bull; Fix count in header
-* <a href="http://github.com/snipe/snipe-it/commit/c2e532e32e4943e251dcb5fdd005e9b65d9798a5">view</a> &bull; Fixed language file for status label messages
-* <a href="http://github.com/snipe/snipe-it/commit/f36029a34a696d89b1058c9abdca7953d51e2bc4">view</a> &bull; Fixed migration for to set assigned_to to null per #506
-* <a href="http://github.com/snipe/snipe-it/commit/f72b38579037d76b5b188c5d85e24ca567e2480b">view</a> &bull; Fix licenses so null instead of 0
-* <a href="http://github.com/snipe/snipe-it/commit/34032c73ceee7a9666680f21bf7490fdc32dbdb6">view</a> &bull; Fixed licenses so null instead of 0
-* <a href="http://github.com/snipe/snipe-it/commit/7b165a12e05396b72381fc2789124acd2b98a2b8">view</a> &bull; Fixes #508 - compacted UI for licenses overview
-* <a href="http://github.com/snipe/snipe-it/commit/c89be345033bfbed326ffd4207a63438ea09378f">view</a> &bull; Fixes #329 and #454 - added category asset view
-* <a href="http://github.com/snipe/snipe-it/commit/35a133bbf9f7330a038dda2e79995b9825ca7633">view</a> &bull; Fixes #382 - allow admins to restore deleted assets
-* <a href="http://github.com/snipe/snipe-it/commit/80e10c4c9838ae4acea8847ed907c6ad05bfac1a">view</a> &bull; Fixes #387 - sortable asset view by manufacturer
-* <a href="http://github.com/snipe/snipe-it/commit/e343c157c5998d6f30a4e25da23ad1092d50c103">view</a> &bull; Fixed naming conflict for requestable
-* <a href="http://github.com/snipe/snipe-it/commit/cd5a352961a1e1e8d90368abf81fedee5ce94bef">view</a> &bull; Fix for wrong math on remaining licenses when assigned to an asset
-* <a href="http://github.com/snipe/snipe-it/commit/342a8b81afb2060a128d0667acc15fa5caafc2ea">view</a> &bull; Fix for error when asset has null status
-* <a href="http://github.com/snipe/snipe-it/commit/8cdd2156143864974423bea70521d45db6d0cb9c">view</a> &bull; Fixed intenting
-* <a href="http://github.com/snipe/snipe-it/commit/fbf03b225d732e12821bfc83b9bae7fb7b4b8be8">view</a> &bull; Fixes #509 - added MAC address as model option
-
-
-###  v1.2.4-beta - Released Feb 11, 2015 01:11:40
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/389c27b2e691743eb361cc1fbe4ece4259ae6046">view</a> &bull; Fixes #477 - wrong sidebar on asset view
-* <a href="http://github.com/snipe/snipe-it/commit/7009b24748edab02921c609c26bc549fa96dcd2f">view</a> &bull; Merge pull request #498 from snipe/fixes/477
-* <a href="http://github.com/snipe/snipe-it/commit/c1600a33db6d4463d27f74f87389489210de700e">view</a> &bull; Fixes #499 - timestamps in asset logs
-* <a href="http://github.com/snipe/snipe-it/commit/b360736b7728d2ac872193bbe8888037c9794494">view</a> &bull; Fixes #484
-* <a href="http://github.com/snipe/snipe-it/commit/addfcd4bc5417784f95145394940f90f1302376f">view</a> &bull; Fix RTD bug
-* <a href="http://github.com/snipe/snipe-it/commit/d2438f9fdb9b281025c17e22ac2bfaa07ce04a2d">view</a> &bull; Fixes #502 - normalized statuses
-* <a href="http://github.com/snipe/snipe-it/commit/aef3a734a3530f109b82fc0897e25727293f9862">view</a> &bull; Small fix for pending status
-* <a href="http://github.com/snipe/snipe-it/commit/f175f52530e58bd5ab80139c526fc7838750cb11">view</a> &bull; Fixed spacer in sidenav for list all
-
-
-###  v1.2.3 - Released Feb 09, 2015 12:22:12
-
-
-###  v1.2.3-beta - Released Feb 07, 2015 06:02:52
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/950567e9d66a6836cbca1383d24fc8548d3cbadf">view</a> &bull; Fixes issue related to #471 - assigning to user ID 0 causes erro
-* <a href="http://github.com/snipe/snipe-it/commit/2b86f14e30c155f72b903428fd05a896ee9adfcc">view</a> &bull; Possible fix for #484 - fullname issue
-* <a href="http://github.com/snipe/snipe-it/commit/b3af102d22a2f4f147b863e0ba8c2e4064aad01a">view</a> &bull; Fixed safe mode issue with license seeder
-* <a href="http://github.com/snipe/snipe-it/commit/1db806f8b283e13dd04f20335d7087d12a04fa23">view</a> &bull; Fixes #488 - longer user jobtitle
-* <a href="http://github.com/snipe/snipe-it/commit/f5efc368a58e1b26689dadb285918b090b66eb59">view</a> &bull; Fixes #487 - maintained and purchase order in strict mode
-* <a href="http://github.com/snipe/snipe-it/commit/4dc81ce65fddced3282a9255a5a31ba8aa6a1458">view</a> &bull; Resolves #478 - redirects non-reporting users to view assets page
-* <a href="http://github.com/snipe/snipe-it/commit/cd338d2a70e1bd4dca3bc651813e51095d7155f0">view</a> &bull; Fixes #483 - line breaks in notes on view
-* <a href="http://github.com/snipe/snipe-it/commit/e67ba8a7437d4f27ae869072898e65749602f2dd">view</a> &bull; Fix reporting error on depreciation
-* <a href="http://github.com/snipe/snipe-it/commit/1aeb4de0fae723801f0cdb555c77b5ee17ae1919">view</a> &bull; Possible fix for #491 - solving for giticide on package dep
-* <a href="http://github.com/snipe/snipe-it/commit/c255edaf617872ac4a896106e56cc816209c2d5b">view</a> &bull; More travis fixes
-* <a href="http://github.com/snipe/snipe-it/commit/feeef4b66c1b6049a1f18c67e034907ea26c7da9">view</a> &bull; Fix for asset log incorrectly using soft deletes
-* <a href="http://github.com/snipe/snipe-it/commit/140bd137a48c199269d635aef57d14b1f0a4330a">view</a> &bull; Minor display fixes
-* <a href="http://github.com/snipe/snipe-it/commit/29f5b7c5e3adc994b727842730c0157429520197">view</a> &bull; Fixed datetime
-
-
-###  v1.2.2 - Released Jan 22, 2015 11:41:36
-* <a href="http://github.com/snipe/snipe-it/commit/4a77dee79c18f0e2ab155c7024234150ce98b808">view</a> &bull; Fixes #447 - added asset log entry on save
-* <a href="http://github.com/snipe/snipe-it/commit/d85e5246807e597c1efac85c368a642a6fdcf944">view</a> &bull; Fixes #451 - allows spaces in state name
-* <a href="http://github.com/snipe/snipe-it/commit/95141d49ba3c4f2b17ed6a26c20e7ad2a8aac9cb">view</a> &bull; Fixes #432 - add model name to checkout
-* <a href="http://github.com/snipe/snipe-it/commit/3787a3f4bab9908f4903abdc2951cc254c8dc911">view</a> &bull; Fixed language strings for incrementing IDs
-
-
-###  v1.2.1 - Released Jan 22, 2015 09:24:01
-
-
-###  v1.2.0 - Released Jan 22, 2015 09:24:01
-* <a href="http://github.com/snipe/snipe-it/commit/8699a90093bd27c0502dcc25f6e7d55344d54a3b">view</a> &bull; Fixed changelog
-* <a href="http://github.com/snipe/snipe-it/commit/cff24309a1514f9ea991881ca72898c7a6358562">view</a> &bull; Possibly fixes #343
-* <a href="http://github.com/snipe/snipe-it/commit/b2d5dc9ec5460ff1f02db6c1a31ea87d224de4c9">view</a> &bull; Fix #342
-* <a href="http://github.com/snipe/snipe-it/commit/74ae2fceea68d18514e87edc008cb3016361beee">view</a> &bull; Fix class on th
-* <a href="http://github.com/snipe/snipe-it/commit/fc2d472ed350d7d63fb97942d00a97b62d4bed55">view</a> &bull; Fixed english language string
-* <a href="http://github.com/snipe/snipe-it/commit/89c7159c56f88bcf8459a5eb02d79d636335cb28">view</a> &bull; Fix array check for empty rows
-* <a href="http://github.com/snipe/snipe-it/commit/7ddc6d497af13e7894031ac763939be9863889a4">view</a> &bull; Fix Report Langs
-* <a href="http://github.com/snipe/snipe-it/commit/13b173409fcd5b5ce8e79566b5110eadcf51c233">view</a> &bull; Fix License form langs
-* <a href="http://github.com/snipe/snipe-it/commit/b73ae3147a60b29ac455063ecf419a609cce2cac">view</a> &bull; Fixes #362, reduced asset name to 2 char min
-* <a href="http://github.com/snipe/snipe-it/commit/637009054cc74b17e2dd226c6f8c467eed5b0962">view</a> &bull; Fixed typo in english
-* <a href="http://github.com/snipe/snipe-it/commit/6905d82fc48998f9c95c454c8bf37a34e30c002e">view</a> &bull; Fixes #374 to keep the requirement to PHP 5.4
-* <a href="http://github.com/snipe/snipe-it/commit/102481631330fbed894bf72510845bff6c88e59e">view</a> &bull; Fix #377 - Checkout users last_name, first_name
-* <a href="http://github.com/snipe/snipe-it/commit/d6a0249c60cbb026b2e3190285d50723a76f22ee">view</a> &bull; Fixed #373 - added ability to auto-increment asset tags
-* <a href="http://github.com/snipe/snipe-it/commit/1b41c974cf67c550b2cae39eeec8f90cb2da79e0">view</a> &bull; Fixes #348 - remove constraints on license keys
-* <a href="http://github.com/snipe/snipe-it/commit/89a2b87e42c18b308835ef71d196b91002b451ef">view</a> &bull; Fixes #367 - added model number to dropdown
-* <a href="http://github.com/snipe/snipe-it/commit/64c16a0bacfcde7c4d92971f2129f1b1aeac2c0e">view</a> &bull; Fixes #386 and #273 - altered column type to text
-* <a href="http://github.com/snipe/snipe-it/commit/daefc86e5878a21f9909806599f22198360c1f9b">view</a> &bull; Formattig fixes for #386
-* <a href="http://github.com/snipe/snipe-it/commit/73dd339772fcc35e50603ded115f67714620da69">view</a> &bull; Fix #388 - License not showing checked out in view
-* <a href="http://github.com/snipe/snipe-it/commit/0663ccb99fa926ff944dded330ba1f0cd95abbb3">view</a> &bull; Check if ->adminuser->id isset before trying to print the fullName so we can catch when a user that created an asset has been deleted. Fixes #349
-* <a href="http://github.com/snipe/snipe-it/commit/533be7f942cb6dfccd1e8a79c043d61791e4c54b">view</a> &bull; fixed #435. using namespace with route groups to increase the readability
-* <a href="http://github.com/snipe/snipe-it/commit/e434616db83a8d693af63b4705e1b24476fc3c17">view</a> &bull; Merge pull request #436 from rashivkp/fix-435
-* <a href="http://github.com/snipe/snipe-it/commit/5e496672c66428a1bbd37772aabd44f8bb1cb0fa">view</a> &bull; Fixes #469
-* <a href="http://github.com/snipe/snipe-it/commit/3c141e8f5017e8f161b6fd1fb82b288283b8450c">view</a> &bull; Fixes #467
-* <a href="http://github.com/snipe/snipe-it/commit/548de1a1a217e6b5c6fcbbf6cd4918f078e64542">view</a> &bull; Fixes #468 - updated ordering on license checkout
-
-
-###  v1.1 - Released Nov 06, 2014 02:16:26
-* <a href="http://github.com/snipe/snipe-it/commit/fafd03f00f49cb9ffe81d50aa9ca3d1f1fa1d043">view</a> &bull; Added DB Prefix to Migrations
-* <a href="http://github.com/snipe/snipe-it/commit/309772e67d62989f1f60141a4a10d724a44c6baa">view</a> &bull; Fixed operator for setting bool display
-* <a href="http://github.com/snipe/snipe-it/commit/22f81912e416cfe1227a08b5d8b6323e32e1ef36">view</a> &bull; Fixes #299
-* <a href="http://github.com/snipe/snipe-it/commit/86b7b6946f1e1bd404127e228c615e4abe0b20fb">view</a> &bull; Fixes #316 - added model name back to view
-* <a href="http://github.com/snipe/snipe-it/commit/9e85dcb9fcb4cc932ecddd23caa6b51e83110543">view</a> &bull; Fixes #315 - add EOL as display option in settings (run migrations)
-* <a href="http://github.com/snipe/snipe-it/commit/ee35948980c22f9256241c02d7febd90275f6229">view</a> &bull; fix div issues
-* <a href="http://github.com/snipe/snipe-it/commit/0022389463e251e73402450cfbc280cb05633bd1">view</a> &bull; Fix dropdown menu position
-* <a href="http://github.com/snipe/snipe-it/commit/343798d241172707145ef365445062db9bb6b99a">view</a> &bull; Merge pull request #322 from madd15/fix-js-delete-asset
-* <a href="http://github.com/snipe/snipe-it/commit/1078dbf5c5f6a5bec1a2ef864cebfcc7883d31e6">view</a> &bull; Fixes #324
-* <a href="http://github.com/snipe/snipe-it/commit/6b2d3efe3e76429c9c2f5de78f04c4f7e2748a3d">view</a> &bull; Fixes #237 - reporting-only group
-* <a href="http://github.com/snipe/snipe-it/commit/e04cc806d9209b54a1833172ebb66ab55b5f0c06">view</a> &bull; Fixes #327
-
-
-###  v1.0 - Released Oct 16, 2014 09:46:47
-* <a href="http://github.com/snipe/snipe-it/commit/a4b220d6c31c97f6504023f0b52527825a4cd897">view</a> &bull; Fixed #191 - allow admins to assign a user during asset creation
-* <a href="http://github.com/snipe/snipe-it/commit/dc1033025a0bc1b2d657e06c89058c3ab95f2c59">view</a> &bull; Fixed #151 - more complete translations
-* <a href="http://github.com/snipe/snipe-it/commit/56d619b218794b43d8c6b182c89c75f83af9dcd9">view</a> &bull; Fixed missing language string
-* <a href="http://github.com/snipe/snipe-it/commit/69fca5d1eda0e5f26d2085f7eebc08fafd84a3ae">view</a> &bull; Fixed #58
-* <a href="http://github.com/snipe/snipe-it/commit/8197e6174e9f12bcfddd94c6bf606ee36e6801bf">view</a> &bull; Fixes #200
-* <a href="http://github.com/snipe/snipe-it/commit/cb8369e9de96aaf1cf9108e22f4038fa6486b881">view</a> &bull; Initial QA Patch to fix errors Add License Add Asset Show Deleted Users License Assign
-* <a href="http://github.com/snipe/snipe-it/commit/62a3ed671bbd957075563933f49e8a5445042737">view</a> &bull; DB migration, layout and clone fixes
-* <a href="http://github.com/snipe/snipe-it/commit/9ccc7d756f9361757eafc1dce9684ee9f5ecc1c3">view</a> &bull; A0.4.2: Added asset, license, user, model cloning and fixed some bugs.
-* <a href="http://github.com/snipe/snipe-it/commit/652f1c746c4757dce9d33d7bd90a9357822c4656">view</a> &bull; Fixes Travis CI build
-* <a href="http://github.com/snipe/snipe-it/commit/363d084bd623f778cd72ca7d385a4fb2f67ef474">view</a> &bull; Fixed DB name in travis CI
-* <a href="http://github.com/snipe/snipe-it/commit/49c5607e1c8a82a3111123ad84b537644546ebb3">view</a> &bull; Fixes #222
-* <a href="http://github.com/snipe/snipe-it/commit/96e40d72b9ac3f74b94b0e39b6f296f0f0b2a1f4">view</a> &bull; fix typo: artisand -> artisan
-* <a href="http://github.com/snipe/snipe-it/commit/e978038cc044f60c2eca71b6319063009a57886f">view</a> &bull; Merge pull request #234 from burlito/typo-fix
-* <a href="http://github.com/snipe/snipe-it/commit/a829fcf52f933d087c3776993b42311ec9a8988e">view</a> &bull; fix: Use the old asset tag when cloning
-* <a href="http://github.com/snipe/snipe-it/commit/ee7d9bec7082dc2e60a4797dea84a0b7443c8090">view</a> &bull; Fixes #279 - QR checkbox not staying checked
-* <a href="http://github.com/snipe/snipe-it/commit/bf1e07555160ede517d41f649d6b1d0911f89dd2">view</a> &bull; Fixes #87 - made datatables responsive
-
-
-###  v0.3.11-alpha - Released Jul 19, 2014 05:16:53
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/ac4c905c42d920d2cf8455d644f4c65332a81d0d">view</a> &bull; Fixed #140
-* <a href="http://github.com/snipe/snipe-it/commit/4a13cded607415d749151cef495332c48c58cf86">view</a> &bull; Fixed path for Travis composer
-* <a href="http://github.com/snipe/snipe-it/commit/ddf946ad5eb6dd8480eeaa709f82af75e0c61444">view</a> &bull; Tried to fix failing build caused by travis composer
-
-
-###  v0.3.10-alpha - Released Jul 17, 2014 05:54:10
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/89a8f3c277d2482b2cd04c4c5c582c9e507770f8">view</a> &bull; Fixes #183 - added employee number to users
-* <a href="http://github.com/snipe/snipe-it/commit/a7b809cb91f49fb2c8eaecc67822fa155a0f20ce">view</a> &bull; Updated title/header for users, additional fixes for #151
-* <a href="http://github.com/snipe/snipe-it/commit/5266d9a30a9663fa80ff764b25ff71726e5c4f4c">view</a> &bull; Fixed title tag for user list view
-* <a href="http://github.com/snipe/snipe-it/commit/43485e1a51330ef585a65b469d7eb85ae7bde13a">view</a> &bull; Fixed language definition
-* <a href="http://github.com/snipe/snipe-it/commit/6b5a552d95ff6f6d5567275b50fcd487fb793820">view</a> &bull; Fixed #186 - Bug with select box not retaining selections on edit screen
-* <a href="http://github.com/snipe/snipe-it/commit/90eb883b671919ea360122c2bf44433995a12144">view</a> &bull; Fixed #187 - replaced dummy site name with site name from admin panel preferences
-* <a href="http://github.com/snipe/snipe-it/commit/f22f23f21dc11d393854849580f0c1229cec9827">view</a> &bull; Fixed button label on forgotten password page
-* <a href="http://github.com/snipe/snipe-it/commit/2b9494ed8271254f8f84e016f238d518e6109842">view</a> &bull; Fixed inconsistent password requirements across admin user creation, user profile and forgotten password
-* <a href="http://github.com/snipe/snipe-it/commit/9dc40a3a9c161267fd8c88aacc1fbf536c1ec2de">view</a> &bull; Fixed a few CSS quirks
-* <a href="http://github.com/snipe/snipe-it/commit/99003e126a8fd0ad9aaea5a550e0af5e306fc1bb">view</a> &bull; Fixed bug with edit (supplier_id), added requestable field for assets
-* <a href="http://github.com/snipe/snipe-it/commit/21251b462308f2d783b83be1a331a0faf0813d16">view</a> &bull; Fixed #190, where depreciation on licenses would not be saved
-* <a href="http://github.com/snipe/snipe-it/commit/89000440f344f766a31adc69718d7f66df235abf">view</a> &bull; Added admin ability to unsuspend locked accounts #changelog
-* <a href="http://github.com/snipe/snipe-it/commit/e203fc516fadf6218f5ce87c070d0cdba9fca188">view</a> &bull; Fixes #194
-
-
-###  v0.3.9-alpha - Released Jul 03, 2014 02:08:38
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/2825bcb4310899e89ccbc73dfa8b59ade28018da">view</a> &bull; Fixed #179 - account page to show assets checked out to the logged in user
-* <a href="http://github.com/snipe/snipe-it/commit/c782f29f5aae752a6246be9778d418df172dd4f6">view</a> &bull; Pulled account sub-nav into top menu to free up UI space. #changelog
-* <a href="http://github.com/snipe/snipe-it/commit/fad2ec66fa9abe0b34baf16cce453a7e9fc9e4d4">view</a> &bull; More README fixes and refinement
-
-
-###  v0.3.8-alpha - Released Jun 27, 2014 09:28:22
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/3e7a9e45d1954531bbc3b73f2ed59dd16d59c657">view</a> &bull; Fixes PR #168 and #167
-* <a href="http://github.com/snipe/snipe-it/commit/945cb3253f1349e30aafa4e7cb57bb507a2ea0cc">view</a> &bull; Fix #117
-* <a href="http://github.com/snipe/snipe-it/commit/6f42b3045e2a65cdf98ec1038284cc2ecf01fa5d">view</a> &bull; Resolves #155
-* <a href="http://github.com/snipe/snipe-it/commit/380417953b6b67a506f0cc395fd2dfb744cf26cd">view</a> &bull; Fixed missing string
-* <a href="http://github.com/snipe/snipe-it/commit/b09aec67f1ab76ff0435a2e1e49b179c3d73bc12">view</a> &bull; Fixes #155
-* <a href="http://github.com/snipe/snipe-it/commit/124acc89c4027e346daf54c62cb38b85586de870">view</a> &bull; Resolves #174
-* <a href="http://github.com/snipe/snipe-it/commit/afabd2814205fdcd83b7bf9ce9095aa367b08311">view</a> &bull; Additional fixes for #167
-* <a href="http://github.com/snipe/snipe-it/commit/a170efae2796314896d548d86b79d89d859c37d2">view</a> &bull; fix for #167
-* <a href="http://github.com/snipe/snipe-it/commit/ec9eab81bfb3b35bfe7ad06008b26f19009e6638">view</a> &bull; Closes #177 - change log file added, needs refining
-
-
-###  v.0.3.5-alpha - Released Jun 20, 2014 02:23:09
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/d1499deecdff3c7a4235ffdfad5adbddc1a5098f">view</a> &bull; Provisions for strict mode, fixed license deletion bug
-
-
-###  v.0.3.4-alpha - Released Jun 19, 2014 10:27:59
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/08d05b481f6366ad48fcdce72a8df53755f5dee8">view</a> &bull; Fixes #158
-
-
-###  v.0.3.3-alpha - Released Jun 18, 2014 08:04:46
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/3518ab9f55f7992d6d4f886389d67b062a02f2d8">view</a> &bull; Fixes #139
-* <a href="http://github.com/snipe/snipe-it/commit/ad9b1fc446ab15157502fe7c52ddbda455e3ea8f">view</a> &bull; Fixes #139
-* <a href="http://github.com/snipe/snipe-it/commit/dfa5d1c64205b23c4c3d16190d1478da8aa0edbb">view</a> &bull; Fixes #136
-* <a href="http://github.com/snipe/snipe-it/commit/9714178ce1fa1e2814389e4b6b82eb596a650084">view</a> &bull; Fixes #141
-* <a href="http://github.com/snipe/snipe-it/commit/607484b29407718238571eb5269c9c27830338f7">view</a> &bull; Fixes #141 for mysql with strict mode enabled
-* <a href="http://github.com/snipe/snipe-it/commit/cbc945299e7f67f5f10dfdc6a875e5c53ac8440a">view</a> &bull; Fixes #148
-* <a href="http://github.com/snipe/snipe-it/commit/dc256583d410cb09253e30b075149c79fb4864e5">view</a> &bull; Fixes #144
-* <a href="http://github.com/snipe/snipe-it/commit/610c405aa50118163ad5d26d43e4bf6c2456f624">view</a> &bull; More fixes for #151
-
-
-###  v.0.3.2-alpha - Released May 06, 2014 08:26:21
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/f4c5da57d0397877d90aa398267e59fcffee7b47">view</a> &bull; Fixed auth error when user isn't logged in
-
-
-###  v.0.3.1-alpha - Released May 06, 2014 04:48:09
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/efad5db082d1461ea26556fad2f1671a49dc1480">view</a> &bull; Fix for broken datatables in upgrading to v2.2
-* <a href="http://github.com/snipe/snipe-it/commit/5690e9ce1f178486179ce6cdfb00ca417acd87dd">view</a> &bull; Fixed code indentation for Apache virtualhost example
-* <a href="http://github.com/snipe/snipe-it/commit/67aba76d3f83c5f374c05fe07d52eebd81d13278">view</a> &bull; Fixing this change from #109 that somehow got reverted
-* <a href="http://github.com/snipe/snipe-it/commit/06067fc19c0127fdcbb78541e7cdc8e77f5444ac">view</a> &bull; Fixed CSV rexport
-
-
-###  v0.3.0-alpha - Released Jan 29, 2014 01:28:31
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/d91d75abe4df19dd6cd54705ba9967295973ced0">view</a> &bull; Fixing JSON parse errors from #97
-* <a href="http://github.com/snipe/snipe-it/commit/baab758377e117a86c3273dd1d6e03e66b02dc8b">view</a> &bull; Fixed language support
-* <a href="http://github.com/snipe/snipe-it/commit/a678ec41714f5d7f77418b5933bc112aa67eae9c">view</a> &bull; Fixed Gravatar Hash
-* <a href="http://github.com/snipe/snipe-it/commit/c08d672e4923b12972eae76d0699e6a301f911cd">view</a> &bull; Fixes mail config documentation
-* <a href="http://github.com/snipe/snipe-it/commit/fba853a6a7a2f8166265cac2e99a526fd9b88c7b">view</a> &bull; Fixes composer formatting issues
-* <a href="http://github.com/snipe/snipe-it/commit/c11510fdcac2b2de09ae9e241c846426bdf0b187">view</a> &bull; Removes sorting from actions column.  Fixes #56
-* <a href="http://github.com/snipe/snipe-it/commit/ae05f2701559a841cb8d9bc8767e6d7a56dcd93c">view</a> &bull; Fixed depreciation bug
-* <a href="http://github.com/snipe/snipe-it/commit/d591c1ea0495de091eb0f71daa8572929096c897">view</a> &bull; Fixed bug where RTD = 1 instead of 0
-* <a href="http://github.com/snipe/snipe-it/commit/e49420f62d26405b2fa0385f0ae7b3009b3beeaf">view</a> &bull; Fixed bug in depreciation display
-* <a href="http://github.com/snipe/snipe-it/commit/1dc7fd1bdf8852fed6d886938f632c8ea69d4798">view</a> &bull; Fixed depreciation display on asset view
-* <a href="http://github.com/snipe/snipe-it/commit/211a527ae176df667f6f8fbc95901c53a368d8e2">view</a> &bull; Fixed FK
-* <a href="http://github.com/snipe/snipe-it/commit/aaebaa8d36158aafc61988a6370239e85f2e75e5">view</a> &bull; Bugfix to put custom title in the page title
-* <a href="http://github.com/snipe/snipe-it/commit/194150bbf0493512018390d011e8d88d144e9763">view</a> &bull; Hacky shit to fix pagination weirdness - will come back to this
-* <a href="http://github.com/snipe/snipe-it/commit/5fb649b59e76aa9db6e433ad8c9fc75b4b8d5fc2">view</a> &bull; Fixed error message layout
-* <a href="http://github.com/snipe/snipe-it/commit/7bc9a53b133895206a3df230baca50d3879abbe5">view</a> &bull; Fixed error when user is invalid
-* <a href="http://github.com/snipe/snipe-it/commit/82de635a75aba376209b741ce1ed4497b91e65e0">view</a> &bull; Fixed invalid seed data
-* <a href="http://github.com/snipe/snipe-it/commit/b697c77cd85416ca502ec3bb28c990099c7faae3">view</a> &bull; Fixing error when no depreciation
-* <a href="http://github.com/snipe/snipe-it/commit/432f44118f46381bdaa44daf61dfa35677aba0ee">view</a> &bull; Fixed FK in licenses model
-* <a href="http://github.com/snipe/snipe-it/commit/4468cbd096e9990300240205baf7139eafbc423c">view</a> &bull; Fixes #112
-* <a href="http://github.com/snipe/snipe-it/commit/cd62be0de03da071f344c8f66730cbc9e1475fb7">view</a> &bull; Minor div fix
-* <a href="http://github.com/snipe/snipe-it/commit/9c369d72e1e7e29f3c205586c916b2f42b250047">view</a> &bull; Fixed typo
-* <a href="http://github.com/snipe/snipe-it/commit/60d94eea04d1ebb93704e6a0d20621ff18708272">view</a> &bull; Changes serial to text area, allow new lines. Fixes #118
-* <a href="http://github.com/snipe/snipe-it/commit/580590b4c0b4a2f76ef8edfe02de986267fc7395">view</a> &bull; Fixed  === to  == (PHP is loosely typed)
-
-
-###  v0.2.0-alpha - Released Nov 29, 2013 10:09:07
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/06cbd0723e415d81ea12aa48f2c37188741b2dbc">view</a> &bull; Fixes #93
-* <a href="http://github.com/snipe/snipe-it/commit/e305099b45401c871f16fec23c200080830fcd5d">view</a> &bull; Fixed model view
-* <a href="http://github.com/snipe/snipe-it/commit/7003eff42ca0e0ea2b9070187c0afd8ba1a8d8b0">view</a> &bull; More fixes for #88
-* <a href="http://github.com/snipe/snipe-it/commit/567f395afaa19335671f366ce889630426f33273">view</a> &bull; More fixes for #88
-* <a href="http://github.com/snipe/snipe-it/commit/02f1977d301cd449aa806e02e8a829516d436ef7">view</a> &bull; Fixed error message
-* <a href="http://github.com/snipe/snipe-it/commit/11c657ffa4c3bdd01cd04b81d01980b2d795107c">view</a> &bull; Fixes #36
-
-
-###  v0.1.2-alpha - Released Nov 29, 2013 01:59:05
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/b1aa67ddb72158513f0a706996c8c1f5b3609aa5">view</a> &bull; Fixes #69
-* <a href="http://github.com/snipe/snipe-it/commit/aa38d83ba6369215451d905e599492214e9f4b8b">view</a> &bull; Fixes #63 and #70
-* <a href="http://github.com/snipe/snipe-it/commit/65cd28aad3903e11879e01faba382454dec7e75c">view</a> &bull; Fixes #14
-* <a href="http://github.com/snipe/snipe-it/commit/6552401fd869fd285aef5e217438f4f055b53ab6">view</a> &bull; Fixes #77
-* <a href="http://github.com/snipe/snipe-it/commit/012a889444fa25b174a5fb2c67e89c8c5fcf09aa">view</a> &bull; Corrected license seat count associated with license. Fixes #75
-* <a href="http://github.com/snipe/snipe-it/commit/9e189aa309750c221c27352f35e2ca1f5fab9173">view</a> &bull; Fixes #80, also prevents the user from checking out an asset that is undeployable, etc
-* <a href="http://github.com/snipe/snipe-it/commit/8680d98bc36bffa08f87020300b315d26be09928">view</a> &bull; Fixed status display bug
-* <a href="http://github.com/snipe/snipe-it/commit/4fcdf72ab6505625f244a6e6ee8683204fb81ccd">view</a> &bull; Responsive design bug fixes, placeholder code for #64 (commented out)
-* <a href="http://github.com/snipe/snipe-it/commit/d9a37f38228d55bb6265efc626e3ab7919013362">view</a> &bull; Fixes #88
-* <a href="http://github.com/snipe/snipe-it/commit/5858bfb99b2144fbc805ec62cc90e6aaaf019f77">view</a> &bull; Fixed language file paths caused by #88
-* <a href="http://github.com/snipe/snipe-it/commit/9f7cbc8a4f01ddf2596e831f658c9a8c321b2f46">view</a> &bull; Another fix related to #88, also accounts for users with invalid location_ids
-* <a href="http://github.com/snipe/snipe-it/commit/1b56c31a22afd39a875677714b9c07e96876b8df">view</a> &bull; Fixed relationship between users/locations because fuck you ORM
-* <a href="http://github.com/snipe/snipe-it/commit/f0f07b578b2439a627e5e946df0849d88d8526cf">view</a> &bull; Fixing pivot for users
-* <a href="http://github.com/snipe/snipe-it/commit/9fa826b2e77ce22d25a8b3094bc825802d25be85">view</a> &bull; Fixed assigned to id
-* <a href="http://github.com/snipe/snipe-it/commit/839d01a3af08d780be4152bc02b33bff1a7d7f20">view</a> &bull; Fixed relationship method because fuck you ORM
-
-
-###  v0.1.1-alpha - Released Nov 26, 2013 11:11:00
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/1527b88fd671a20c879c9b2061ae95f3b386ba27">view</a> &bull; Fixes #61
-* <a href="http://github.com/snipe/snipe-it/commit/4c0af1eae1031c2630f6e29cc73f8a9dfac1081c">view</a> &bull; Fixed typo causing failure with mysql strict
-* <a href="http://github.com/snipe/snipe-it/commit/0e3bcfecd05a39bfea6fc7ba11cb24d9d49e6d86">view</a> &bull; Should be final fixes for mysql strict mode
-
-
-###  Initial alpha - Released Nov 26, 2013 09:01:13
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/14972f894bb0e761e2d0170a2c93c9aac4edfca6">view</a> &bull; fixed typo
-* <a href="http://github.com/snipe/snipe-it/commit/79da13dff767d57f6f4fbb12f195e25f409ee5ec">view</a> &bull; Fixed layout for category view
-* <a href="http://github.com/snipe/snipe-it/commit/0e4e26206bdcc164e5df586368ed45edd45b9a74">view</a> &bull; fixed broken redirect route
-* <a href="http://github.com/snipe/snipe-it/commit/9364c46c2df79c0de07dc5dbb724a3c44485b739">view</a> &bull; Fixed licensed link
-* <a href="http://github.com/snipe/snipe-it/commit/4f0a1789db01f12ebc4bd47e7e0594bf67b64daf">view</a> &bull; Fixed license blades
-* <a href="http://github.com/snipe/snipe-it/commit/27514f85c3ba9056c4609774a482a58605f4d8cf">view</a> &bull; Fixed typo in variable name
-* <a href="http://github.com/snipe/snipe-it/commit/ffe786f659e3e8c5b91c27cd33cb77b6d24d3545">view</a> &bull; Fixed routes.
-* <a href="http://github.com/snipe/snipe-it/commit/cf59ec8c67e142c0612fb7797448057b19af5cfa">view</a> &bull; Fixed pagination bug
-* <a href="http://github.com/snipe/snipe-it/commit/76ac39115347dabac8ada21d981494a3edf7a29c">view</a> &bull; Fixed edit bug where new Category was invoked twice
-* <a href="http://github.com/snipe/snipe-it/commit/940281dd4dd0a69b900a052c0bb84e24dde89666">view</a> &bull; Fixed bug on validation display
-* <a href="http://github.com/snipe/snipe-it/commit/31d323fb71fcbe94f17f0a2b38183709e8c77151">view</a> &bull; Cosmetic fix on form
-* <a href="http://github.com/snipe/snipe-it/commit/8f86ec9dae58cef27387b028f70c8116d649b425">view</a> &bull; Change depreciation to be by month; formatting fixes.
-* <a href="http://github.com/snipe/snipe-it/commit/4da2bccbf78a0b630267c6ed75f3a1bd8100e20d">view</a> &bull; Merge pull request #27 from snipe/depreciation_fix
-* <a href="http://github.com/snipe/snipe-it/commit/7bc7ffb72813cd176658d536bbdd6be0faa9a45c">view</a> &bull; Fixed some error reporting/required fields around checkout/checkin
-* <a href="http://github.com/snipe/snipe-it/commit/48e180c6910d30732559b0cc077fce679344f56e">view</a> &bull; Fixed asset bug caused by unique validation in assets model
-* <a href="http://github.com/snipe/snipe-it/commit/57107dceeee81e8618198da33af79fe66bde0d9e">view</a> &bull; Fixed checkin text
-* <a href="http://github.com/snipe/snipe-it/commit/7b59f42fb03ee5017c11cf32abc8a23c3f5d2141">view</a> &bull; Fixed pagination bug, styled buttons
-* <a href="http://github.com/snipe/snipe-it/commit/ffdb4b1aa8dde9942f7c3b110e9a68006779998b">view</a> &bull; Fixed wonky layout issue
-* <a href="http://github.com/snipe/snipe-it/commit/3401fee672d796f4aca8dafced6917c7caf87866">view</a> &bull; Another table fix
-* <a href="http://github.com/snipe/snipe-it/commit/ddfd69e5100b19bb05d6b76cb9fad3dbadad1921">view</a> &bull; More table fixes
-* <a href="http://github.com/snipe/snipe-it/commit/5c43caf0579a26c1604fc81f5cbdf8f0d43c157d">view</a> &bull; More table fixes
-* <a href="http://github.com/snipe/snipe-it/commit/44ba90f9f0a968999a743c35dd2bf153c2edbf1d">view</a> &bull; Fixed icon set to white in main nav
-* <a href="http://github.com/snipe/snipe-it/commit/719c36d482cc67f1513351672eda057519f7f735">view</a> &bull; migration to fix a few fields in the log table
-* <a href="http://github.com/snipe/snipe-it/commit/5b27a34f050646467a178ff780efc80036aadf1b">view</a> &bull; Fixed fieldname in userlog
-* <a href="http://github.com/snipe/snipe-it/commit/76da83cbe1c4334380bb996a40cc374ab4ec12e9">view</a> &bull; Fixed links to edit/checkout
-* <a href="http://github.com/snipe/snipe-it/commit/d6a718e99766829e700760c2266b62ad37cdb66b">view</a> &bull; Fixed bug in views for created_at date
-* <a href="http://github.com/snipe/snipe-it/commit/0ee08e47e9f2b144084703142ae5eb099090476d">view</a> &bull; Fixed fatal error if admin who created the asset was deleted. (This should never happen, but...)
-* <a href="http://github.com/snipe/snipe-it/commit/61cceb5f0b44e7f2a82ccca44be2bc42e8825156">view</a> &bull; Fixed open tag in CSS
-* <a href="http://github.com/snipe/snipe-it/commit/c93469c465c0ce8a291d595ac8ccbafbfc68c71a">view</a> &bull; Fixed query for asset/license header boxes
-* <a href="http://github.com/snipe/snipe-it/commit/d46556a83d5335913b8b7fe8558f416540290343">view</a> &bull; Fixed phone display if no value set
-* <a href="http://github.com/snipe/snipe-it/commit/fc8c3c086ca70a513cd3fff39275fcf035cead5a">view</a> &bull; fixed #37
-* <a href="http://github.com/snipe/snipe-it/commit/52020d09f034c9de78b798725c0f3700d0253beb">view</a> &bull; Fixed bomb when asset is unassigned
-* <a href="http://github.com/snipe/snipe-it/commit/1b1efec858e8e0cfc5cfafc63bfb537e45191cd1">view</a> &bull; Fixed foreign key in assets
-* <a href="http://github.com/snipe/snipe-it/commit/b7251d9992401c04a5da1771af0fcddad2754362">view</a> &bull; Fixed potential bug in blade
-* <a href="http://github.com/snipe/snipe-it/commit/9249786a25bc166bf5341f59a11d644cf4f6425c">view</a> &bull; Fixed status display
-* <a href="http://github.com/snipe/snipe-it/commit/c32d45e90142b41b567a350af6d399af67994a02">view</a> &bull; Fixed ID
-* <a href="http://github.com/snipe/snipe-it/commit/2203789f4c5310599a94799bb3ead9ff9c1ce802">view</a> &bull; Fixes #41
-* <a href="http://github.com/snipe/snipe-it/commit/03edbc008c671c868fced94a7761683309d9ab8b">view</a> &bull; Fixes #43
-* <a href="http://github.com/snipe/snipe-it/commit/2b088a3fb2ea7711f66e4a887882b17f401ba4bc">view</a> &bull; Fixes #17
-* <a href="http://github.com/snipe/snipe-it/commit/ad680a337e50638b4b9865e42e4ea7e453c4151b">view</a> &bull; Fixed column name spelling in DB
-* <a href="http://github.com/snipe/snipe-it/commit/718236b2d4bedeaaad80cc601e3e91a3229e81fa">view</a> &bull; Fixed #9
-* <a href="http://github.com/snipe/snipe-it/commit/3cc0ed87438b632679ce8b61a7ea0fae48999438">view</a> &bull; Fixed sorting weirdness
-* <a href="http://github.com/snipe/snipe-it/commit/57d0f3643518190f0b4a6fe33ac6d83eda647119">view</a> &bull; Fixes #4
-* <a href="http://github.com/snipe/snipe-it/commit/3ea0ad87c8733ce1bac0e9c10c2cdaf3254743d5">view</a> &bull; Fixes #22
-* <a href="http://github.com/snipe/snipe-it/commit/e87e5b9cae19bfd06b815cf01be309d665409828">view</a> &bull; Fixes #46
-* <a href="http://github.com/snipe/snipe-it/commit/7a5b133c5875959c5d7bebf16ea82bac7ceb3989">view</a> &bull; Fixed bug linking to assets when they should be pointing to licenses
-* <a href="http://github.com/snipe/snipe-it/commit/e13578d97d6b1ef1990f171beda9b35868fda47c">view</a> &bull; Fixed error when no category is given
-* <a href="http://github.com/snipe/snipe-it/commit/45c04b1cdebc0b19243a519d2580af921c82b47b">view</a> &bull; Fixed display bug
-* <a href="http://github.com/snipe/snipe-it/commit/4d1dd1c446f76e5530d6fb7f932a77a8da2d0b73">view</a> &bull; Fixed #50 - MOAR VALIDATION!
-* <a href="http://github.com/snipe/snipe-it/commit/12958553022d4b7b2184ebf837d4113b23f5cf27">view</a> &bull; Fixes #51
-* <a href="http://github.com/snipe/snipe-it/commit/d0cbb9f3a7e4a1fc05ddcabd19e201434c14370b">view</a> &bull; Fixes #52
-* <a href="http://github.com/snipe/snipe-it/commit/5bf38b1d02e743af22a51393f1e477100b1f76b7">view</a> &bull; Fixes #50
-* <a href="http://github.com/snipe/snipe-it/commit/e6fc1956fc93132d04bf5ac4c0d108c1ae9eee0b">view</a> &bull; Fixes #55
-* <a href="http://github.com/snipe/snipe-it/commit/ee3fb2785e719c938b6036f6ea74527c1217aba8">view</a> &bull; Fixed XSS on modal
-* <a href="http://github.com/snipe/snipe-it/commit/dc5ad876863a1e17babce06adfb365f38c30ca59">view</a> &bull; Fixes #59
-* <a href="http://github.com/snipe/snipe-it/commit/d7a8cac1dc6158983673688c2e48e9a48217b6f2">view</a> &bull; Fixed validation
-* <a href="http://github.com/snipe/snipe-it/commit/196710dac807d48f6c73b02c2444a5b8d301b8a6">view</a> &bull; Fixed bug in error validation display
-
-
-###  v1.2.10 - Released Aug 06, 2015 11:00:46
-* <a href="http://github.com/snipe/snipe-it/commit/5455abfd16b45561bda3077f58032652d8e660ad">view</a> &bull; Fix for importer
-* <a href="http://github.com/snipe/snipe-it/commit/5297d699b3f28704156a076d684210eb522919a0">view</a> &bull; Fix logo url
-* <a href="http://github.com/snipe/snipe-it/commit/336858e4ed786f7cdbd147db8b04430e95a548bf">view</a> &bull; Fix #1022 - Missing Lang on viewing deleted user
-
-
-###  v1.2.9 - Released Jul 23, 2015 07:33:26
-* <a href="http://github.com/snipe/snipe-it/commit/c8870ddcab0b521c9682cd8c5ab6fd56ee01753a">view</a> &bull; Fixes #736 - more fields in bulk edit
-* <a href="http://github.com/snipe/snipe-it/commit/5e7a4e8193b26875729089b36b28adca1644cb8d">view</a> &bull; Fixes #599 - show groups in user list
-* <a href="http://github.com/snipe/snipe-it/commit/f463cd6c8d72d9d28cd984ccad08fc596edbdaac">view</a> &bull; Fixes for #759 - location heirarchy
-* <a href="http://github.com/snipe/snipe-it/commit/51eeee09d72148d4dae629744753a96e51c1b8ae">view</a> &bull; Fixes bug in #736 for new fields
-* <a href="http://github.com/snipe/snipe-it/commit/3881e2e83eb72c1567db6c45afa40d7f79330bb3">view</a> &bull; Fixes #784 - add "create accessory" to topnav
-* <a href="http://github.com/snipe/snipe-it/commit/aab52d08506f5bc1fd0fcf35229e04b0cb5883bb">view</a> &bull; Fix for strict mode with location parent
-* <a href="http://github.com/snipe/snipe-it/commit/2f52369d075d6f95cd188acf14a23fcd9d431213">view</a> &bull; Fixed location string
-* <a href="http://github.com/snipe/snipe-it/commit/139dd1339271351714623e53d323cce5356618de">view</a> &bull; Super janky miulti-level menu on create - TODO: Fix this ish.
-* <a href="http://github.com/snipe/snipe-it/commit/2d7a348ab705fbca6f432f7adf0861085ab836c5">view</a> &bull; Fixed multi-level array nesting for locations
-* <a href="http://github.com/snipe/snipe-it/commit/95279f885b231eda371835b9eeb998c683cfbfd3">view</a> &bull; Fixes #759 - populate form with parent location info
-* <a href="http://github.com/snipe/snipe-it/commit/8cdea8a38404ed2187fa59f8e7f9198cb9ce94bb">view</a> &bull; Fix for location totals
-* <a href="http://github.com/snipe/snipe-it/commit/496a768013c759a4e3fa190f5970bbb865cebd62">view</a> &bull; Fixes #795 - add model name if no asset name
-* <a href="http://github.com/snipe/snipe-it/commit/7c95f4231e3281ca99744aa3ba8e530cf746c6ba">view</a> &bull; Fixes #799 - missing text in file delete confirmation
-* <a href="http://github.com/snipe/snipe-it/commit/212f09dd310ba54f6b513ff867e7641bdc8cb3f1">view</a> &bull; Fixes #806
-* <a href="http://github.com/snipe/snipe-it/commit/2540ac09ec9aa9d0e461be52fe117379a21474e0">view</a> &bull; Fixes #822
-* <a href="http://github.com/snipe/snipe-it/commit/766b4b901f8dbefe4e052d1927f274a0ace4d7d3">view</a> &bull; Fixes #822 - make user notes field nullable default null
-* <a href="http://github.com/snipe/snipe-it/commit/fdef26608971b747ca3ac9ada87f295311543892">view</a> &bull; Addresses #577 and fixes #165 - switch from email to username
-* <a href="http://github.com/snipe/snipe-it/commit/f42540fedf92a315614c6c1dfacd31879fef2a78">view</a> &bull; More fixes for #165 - added username field
-* <a href="http://github.com/snipe/snipe-it/commit/3d4607ebd3e7f6494912f38be40945eb4aa6a57b">view</a> &bull; Fixes #858 - find admin group by name instead of ID for consideration of clustered DBs
-* <a href="http://github.com/snipe/snipe-it/commit/10135802367f015e0b91329d692e3358ef7ffeae">view</a> &bull; Fixed typo
-* <a href="http://github.com/snipe/snipe-it/commit/bf6674f6a0252abf51977a355cadc6fccbde7cd7">view</a> &bull; Added table prefix for raw queries
-* <a href="http://github.com/snipe/snipe-it/commit/ea0f2c5f347d31a1543b7b3c980c9909a3e2403d">view</a> &bull; Fixes #833 - remove status label field if asset is checked out
-* <a href="http://github.com/snipe/snipe-it/commit/edddf6ae80cfa60af17544ed06c1b7c5883afe7a">view</a> &bull; Fixes #833 - remove status label field if asset is checked out
-* <a href="http://github.com/snipe/snipe-it/commit/2e585f9cd205e7fad93559281ac92b0fb09f816e">view</a> &bull; Fixes #839 - bad seed data
-* <a href="http://github.com/snipe/snipe-it/commit/75b9b70a8632f10c7c55b6a62e8d19e6f8b4ebe8">view</a> &bull; Fix email field so it's nullable, fix app command to add user
-* <a href="http://github.com/snipe/snipe-it/commit/94f8c6172042899f5f28723ceed2b562a5dca912">view</a> &bull; Fixes #280, #64 and #860 - added license expiration alert
-* <a href="http://github.com/snipe/snipe-it/commit/85d6b062f3b2a4da6171d8e026f4077fa3cf4c39">view</a> &bull; Fixed checkbox alignment
-* <a href="http://github.com/snipe/snipe-it/commit/f2e1ec092830822150d463d969ece2ce2f4795d4">view</a> &bull; Fixed QR simple view route
-* <a href="http://github.com/snipe/snipe-it/commit/8ef3d00f2264d5338043887f6d23bb5c0b5cc508">view</a> &bull; Fixed language string for users
-* <a href="http://github.com/snipe/snipe-it/commit/84e130d6aa4a53aea8fc75679ca270b25509a9a9">view</a> &bull; Fixes #869 - compatibility mode for IE
-* <a href="http://github.com/snipe/snipe-it/commit/d4af197b0e8ecde9a36e2417fe7dd2fb7c5c28ec">view</a> &bull; Merge pull request #886 from madd15/Fix---Edit-user
-* <a href="http://github.com/snipe/snipe-it/commit/e714def74aa6aeada6716ef091e599c5ebf9f8a1">view</a> &bull; Fix Reports showing class="active"
-* <a href="http://github.com/snipe/snipe-it/commit/4a5066054b1bb75222c6765675366405a4f70b73">view</a> &bull; Display bugfixes for #819
-* <a href="http://github.com/snipe/snipe-it/commit/7e5f32c9d85cc9a28976732d6232632e1cf0314a">view</a> &bull; Merge pull request #898 from madd15/Default-Layout-fix
-* <a href="http://github.com/snipe/snipe-it/commit/d26c40b26e3daf0ac47eb0064a6d5c88dedd1ec8">view</a> &bull; Fixed issue where email not saved on edit
-
-
-###  v2.0-pre-beta - Released Jul 09, 2015 08:24:43
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/c8870ddcab0b521c9682cd8c5ab6fd56ee01753a">view</a> &bull; Fixes #736 - more fields in bulk edit
-* <a href="http://github.com/snipe/snipe-it/commit/5e7a4e8193b26875729089b36b28adca1644cb8d">view</a> &bull; Fixes #599 - show groups in user list
-* <a href="http://github.com/snipe/snipe-it/commit/f463cd6c8d72d9d28cd984ccad08fc596edbdaac">view</a> &bull; Fixes for #759 - location heirarchy
-* <a href="http://github.com/snipe/snipe-it/commit/51eeee09d72148d4dae629744753a96e51c1b8ae">view</a> &bull; Fixes bug in #736 for new fields
-* <a href="http://github.com/snipe/snipe-it/commit/3881e2e83eb72c1567db6c45afa40d7f79330bb3">view</a> &bull; Fixes #784 - add "create accessory" to topnav
-* <a href="http://github.com/snipe/snipe-it/commit/aab52d08506f5bc1fd0fcf35229e04b0cb5883bb">view</a> &bull; Fix for strict mode with location parent
-* <a href="http://github.com/snipe/snipe-it/commit/2f52369d075d6f95cd188acf14a23fcd9d431213">view</a> &bull; Fixed location string
-* <a href="http://github.com/snipe/snipe-it/commit/139dd1339271351714623e53d323cce5356618de">view</a> &bull; Super janky miulti-level menu on create - TODO: Fix this ish.
-* <a href="http://github.com/snipe/snipe-it/commit/2d7a348ab705fbca6f432f7adf0861085ab836c5">view</a> &bull; Fixed multi-level array nesting for locations
-* <a href="http://github.com/snipe/snipe-it/commit/95279f885b231eda371835b9eeb998c683cfbfd3">view</a> &bull; Fixes #759 - populate form with parent location info
-* <a href="http://github.com/snipe/snipe-it/commit/8cdea8a38404ed2187fa59f8e7f9198cb9ce94bb">view</a> &bull; Fix for location totals
-* <a href="http://github.com/snipe/snipe-it/commit/496a768013c759a4e3fa190f5970bbb865cebd62">view</a> &bull; Fixes #795 - add model name if no asset name
-* <a href="http://github.com/snipe/snipe-it/commit/7c95f4231e3281ca99744aa3ba8e530cf746c6ba">view</a> &bull; Fixes #799 - missing text in file delete confirmation
-* <a href="http://github.com/snipe/snipe-it/commit/212f09dd310ba54f6b513ff867e7641bdc8cb3f1">view</a> &bull; Fixes #806
-* <a href="http://github.com/snipe/snipe-it/commit/2540ac09ec9aa9d0e461be52fe117379a21474e0">view</a> &bull; Fixes #822
-* <a href="http://github.com/snipe/snipe-it/commit/766b4b901f8dbefe4e052d1927f274a0ace4d7d3">view</a> &bull; Fixes #822 - make user notes field nullable default null
-* <a href="http://github.com/snipe/snipe-it/commit/fdef26608971b747ca3ac9ada87f295311543892">view</a> &bull; Addresses #577 and fixes #165 - switch from email to username
-* <a href="http://github.com/snipe/snipe-it/commit/f42540fedf92a315614c6c1dfacd31879fef2a78">view</a> &bull; More fixes for #165 - added username field
-* <a href="http://github.com/snipe/snipe-it/commit/3d4607ebd3e7f6494912f38be40945eb4aa6a57b">view</a> &bull; Fixes #858 - find admin group by name instead of ID for consideration of clustered DBs
-* <a href="http://github.com/snipe/snipe-it/commit/10135802367f015e0b91329d692e3358ef7ffeae">view</a> &bull; Fixed typo
-* <a href="http://github.com/snipe/snipe-it/commit/bf6674f6a0252abf51977a355cadc6fccbde7cd7">view</a> &bull; Added table prefix for raw queries
-* <a href="http://github.com/snipe/snipe-it/commit/ea0f2c5f347d31a1543b7b3c980c9909a3e2403d">view</a> &bull; Fixes #833 - remove status label field if asset is checked out
-* <a href="http://github.com/snipe/snipe-it/commit/edddf6ae80cfa60af17544ed06c1b7c5883afe7a">view</a> &bull; Fixes #833 - remove status label field if asset is checked out
-* <a href="http://github.com/snipe/snipe-it/commit/2e585f9cd205e7fad93559281ac92b0fb09f816e">view</a> &bull; Fixes #839 - bad seed data
-* <a href="http://github.com/snipe/snipe-it/commit/75b9b70a8632f10c7c55b6a62e8d19e6f8b4ebe8">view</a> &bull; Fix email field so it's nullable, fix app command to add user
-* <a href="http://github.com/snipe/snipe-it/commit/94f8c6172042899f5f28723ceed2b562a5dca912">view</a> &bull; Fixes #280, #64 and #860 - added license expiration alert
-* <a href="http://github.com/snipe/snipe-it/commit/85d6b062f3b2a4da6171d8e026f4077fa3cf4c39">view</a> &bull; Fixed checkbox alignment
-* <a href="http://github.com/snipe/snipe-it/commit/f2e1ec092830822150d463d969ece2ce2f4795d4">view</a> &bull; Fixed QR simple view route
-* <a href="http://github.com/snipe/snipe-it/commit/8ef3d00f2264d5338043887f6d23bb5c0b5cc508">view</a> &bull; Fixed language string for users
-* <a href="http://github.com/snipe/snipe-it/commit/84e130d6aa4a53aea8fc75679ca270b25509a9a9">view</a> &bull; Fixes #869 - compatibility mode for IE
-* <a href="http://github.com/snipe/snipe-it/commit/95920be8ea5608f0b3da831f3bac369b05d5aafe">view</a> &bull; Fixed weird commenting
-* <a href="http://github.com/snipe/snipe-it/commit/d4af197b0e8ecde9a36e2417fe7dd2fb7c5c28ec">view</a> &bull; Merge pull request #886 from madd15/Fix---Edit-user
-* <a href="http://github.com/snipe/snipe-it/commit/a22687abc5cc913d5f83ecbac4046ba05353d30e">view</a> &bull; Fix #896 - Only show Checkout/Checkin if deployable
-* <a href="http://github.com/snipe/snipe-it/commit/e714def74aa6aeada6716ef091e599c5ebf9f8a1">view</a> &bull; Fix Reports showing class="active"
-* <a href="http://github.com/snipe/snipe-it/commit/05f0b94bf6b3e746093b45a1ecb6f432e6901880">view</a> &bull; Fixed language string
-* <a href="http://github.com/snipe/snipe-it/commit/de23ec57851f6c5a25b288919d82175dacc27426">view</a> &bull; Fixes #544 - disable checking an asset out to a user if it is not a deployable status
-* <a href="http://github.com/snipe/snipe-it/commit/fd59ca0802998f9d24e3b682182ccea0652b9c6d">view</a> &bull; Fixed spacing
-* <a href="http://github.com/snipe/snipe-it/commit/c2d63915c3ed7e87fcc0b62c0171f6326d15f624">view</a> &bull; Fixed insecure font call
-* <a href="http://github.com/snipe/snipe-it/commit/4a5066054b1bb75222c6765675366405a4f70b73">view</a> &bull; Display bugfixes for #819
-* <a href="http://github.com/snipe/snipe-it/commit/f8be47dfbf567ab75657e02a4e75661a12381a8f">view</a> &bull; Fixes #903 - adds config variable for multi_login, overrides Sentry method
-* <a href="http://github.com/snipe/snipe-it/commit/e9443a244cdf7f9495d1b780ae6478204988f207">view</a> &bull; Small fix to config value
-* <a href="http://github.com/snipe/snipe-it/commit/7e5f32c9d85cc9a28976732d6232632e1cf0314a">view</a> &bull; Merge pull request #898 from madd15/Default-Layout-fix
-
-
-###  v1.2.8 - Released Jun 19, 2015 04:16:08
-* <a href="http://github.com/snipe/snipe-it/commit/a8a0a59982e6f956662b6ff53a1a8c02802b54e2">view</a> &bull; Fixes #825 - title bar spacing issue
-* <a href="http://github.com/snipe/snipe-it/commit/5939e46eeeeb6b1c54cc241ea8e85e358bc21d40">view</a> &bull; Bumped version for fixed 1.2.7
-* <a href="http://github.com/snipe/snipe-it/commit/c69038d3ae7eeb36c3d3f8552092774bdff5340c">view</a> &bull; Fixes #836
-* <a href="http://github.com/snipe/snipe-it/commit/5a6fe6ccf8aa9af8ab09f0cb2fa79130b8ab81ee">view</a> &bull; Fixes #806
-* <a href="http://github.com/snipe/snipe-it/commit/7820efc12127068dff9e1c7a8c97cc2cf939d976">view</a> &bull; Fixes #822 and #847 - added notes field on import for MySQL strict mode
-* <a href="http://github.com/snipe/snipe-it/commit/c3c4e9def212b8bc5a36526bbfff8b1939c01464">view</a> &bull; Fixes #852 - localized string for file types, added zip and rar for asset upload
-
-
-###  v1.2.7-master - Released May 27, 2015 06:45:44
-* <a href="http://github.com/snipe/snipe-it/commit/73a08c031c2ff48bbe7e2886dd986a4566f14908">view</a> &bull; Fixes #818, and randomizes password for dummy user
-
-
-###  v1.2.7 - Released May 02, 2015 07:28:34
-* <a href="http://github.com/snipe/snipe-it/commit/9f9a9a51b36f19969497b196c8dbbeec08f7bdde">view</a> &bull; Fixes #774 - layout issue on profiles
-* <a href="http://github.com/snipe/snipe-it/commit/c95af8445298f3de326f3b3535a62ad2b772c1cb">view</a> &bull; Fixes #750 because @uberbrady can't code
-* <a href="http://github.com/snipe/snipe-it/commit/77d1d93ebcc4867066a1dee5bd049378a1255436">view</a> &bull; Fixes #729 - CSS wordwrap for long licenses
-
-
-###  v1.2.7-beta - Released Apr 30, 2015 01:01:43
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/62d5ed48f087d6e1e4f486e59039d2f87619b056">view</a> &bull; Fixes #645 - added zip/rar to filetypes
-* <a href="http://github.com/snipe/snipe-it/commit/fc81e404cabb734ab90b8fd69ba33e78d2c89157">view</a> &bull; Fix #652 - Change UX of signin form
-* <a href="http://github.com/snipe/snipe-it/commit/5cfb2d5f6a424b7f2d71cc488d76ebcfdf6f802e">view</a> &bull; Fixed modal delete in ajax tables
-* <a href="http://github.com/snipe/snipe-it/commit/6f38f76e4a1c09a3dcbfa6db6dcb56f03f083c12">view</a> &bull; Haha - TOTALLY cheated. But it works. Fixed ordering for linked names
-* <a href="http://github.com/snipe/snipe-it/commit/69b80dc9c6dc4acf7cfad5f61da326b203dad1f8">view</a> &bull; Fixed Sorting
-* <a href="http://github.com/snipe/snipe-it/commit/958a7298fe905e933c1e68f65d22dfa20875ee8a">view</a> &bull; Fix excludes
-* <a href="http://github.com/snipe/snipe-it/commit/bb7d3d1a8515684e646255584bd977e706b75c6f">view</a> &bull; Fix button layouts
-* <a href="http://github.com/snipe/snipe-it/commit/46c1f2a28bb141b65f362936c59779376ba0ce3e">view</a> &bull; Server side datatables for user view - needs fix for deleted users
-* <a href="http://github.com/snipe/snipe-it/commit/0ffb5df40b1983527efabad44e6c32fe0af3141f">view</a> &bull; Fixed changelog order
-* <a href="http://github.com/snipe/snipe-it/commit/3da652216bca192c16783fa52eb83ac650c7fba5">view</a> &bull; Possible fix for #652 - need to test mobile and Cinema display
-* <a href="http://github.com/snipe/snipe-it/commit/e01b1b3935786c7263a7e6fd4913bf1ffaf99965">view</a> &bull; Fix scopeGetDeleted - Missing withTrashed()
-* <a href="http://github.com/snipe/snipe-it/commit/c00086c7407e885219ec18339b0a328652f006ce">view</a> &bull; Fix eager loading for user throttle
-* <a href="http://github.com/snipe/snipe-it/commit/4c3033d414c30da9db73318edce6d75e3ebe2fec">view</a> &bull; Fix spacing between Create and Import
-* <a href="http://github.com/snipe/snipe-it/commit/176264b3178fca6de30a0c5d18b6ac00e6b703b1">view</a> &bull; Fix title for deleted
-* <a href="http://github.com/snipe/snipe-it/commit/4f18a71124bcf93943ae972ca4080a4943166003">view</a> &bull; Fix space in title
-* <a href="http://github.com/snipe/snipe-it/commit/519575893d800790a3455ee263777cc675c49ad9">view</a> &bull; Fix JS modal error
-* <a href="http://github.com/snipe/snipe-it/commit/9edcc39de244c76ae2b8f8df473aa891996cd53d">view</a> &bull; Fix restore button now showing
-* <a href="http://github.com/snipe/snipe-it/commit/c14761b9a1af093c748c2bfa19b38a38c200502e">view</a> &bull; Re-fix button not showing
-* <a href="http://github.com/snipe/snipe-it/commit/c8bf26a3b3d29f44f6b45dfbbda5a33985ae076d">view</a> &bull; Fix layout of loading box
-* <a href="http://github.com/snipe/snipe-it/commit/4aa4e7c9fc831f151e4fd4a2676b7f8e1b845841">view</a> &bull; Fix error if user is not in throttle table
-* <a href="http://github.com/snipe/snipe-it/commit/3782531f57b79a9877107ddee16c77e01e142cfd">view</a> &bull; Fix missing </div>
-* <a href="http://github.com/snipe/snipe-it/commit/2d9e49f245565e7236145981163af64cc20233c4">view</a> &bull; Fix #682 - Updated buttons and data loading
-* <a href="http://github.com/snipe/snipe-it/commit/c79fd5ed304915450109652d4d4cb13b322f90d2">view</a> &bull; Fix showAll on Print
-* <a href="http://github.com/snipe/snipe-it/commit/da983af2cb05901ecc22fbc9691f3dff9e23a5e8">view</a> &bull; Fix #683 - Use sAjaxSource, change to processing
-* <a href="http://github.com/snipe/snipe-it/commit/86623822f5d0641764913a9db51cda0ecc79dfd5">view</a> &bull; Trying to fix the build
-* <a href="http://github.com/snipe/snipe-it/commit/35bbea30521984cf9038244b52deab97a8565f5a">view</a> &bull; Fixes #688 - show model if no asset name
-* <a href="http://github.com/snipe/snipe-it/commit/faa999ab2b471fed92062d738f695cdc0c0985c8">view</a> &bull; Fix incorrect values
-* <a href="http://github.com/snipe/snipe-it/commit/66d187223041093f9e75190cf6e7c54586ec885d">view</a> &bull; Fix button spacing
-* <a href="http://github.com/snipe/snipe-it/commit/a9f15fbcaef14ae1f78f08da632032c41074c0f9">view</a> &bull; Convert Categories View to use Datatables, and fix Model View missing comma
-* <a href="http://github.com/snipe/snipe-it/commit/d9b92240450f559d60b811d6ab6be948995de9e5">view</a> &bull; Fix mobile unable to click sign in
-* <a href="http://github.com/snipe/snipe-it/commit/7f2ccc860b5af8effdadff91119d5d9ffe9c0584">view</a> &bull; Remove forgot password link and fix save icon
-* <a href="http://github.com/snipe/snipe-it/commit/d952a1199b285dd2c7de3567ea6f4d006c489920">view</a> &bull; Remove forgot password link and fix save icon
-* <a href="http://github.com/snipe/snipe-it/commit/b32379393f7572fe0199920ec6453ca4bc05aab6">view</a> &bull; Fix missed hardware statuses
-* <a href="http://github.com/snipe/snipe-it/commit/06b3d6e5cef265546ae457d6088324bff6a97440">view</a> &bull; Fix saveState, change chumper defaults
-* <a href="http://github.com/snipe/snipe-it/commit/7d35fae0f499f4f4e4453e74e3b144a4ca2f4f5c">view</a> &bull; Fix processing stuck on exit print view
-* <a href="http://github.com/snipe/snipe-it/commit/5d946b19cb9a00676fb5d40e7d15238bbb8aec86">view</a> &bull; Fixed checkmodel at route level
-* <a href="http://github.com/snipe/snipe-it/commit/0c827b318bfe6d4e5ac28c0cee133e5c625abf57">view</a> &bull; Default location fix
-* <a href="http://github.com/snipe/snipe-it/commit/b0886f970acffdec302bd6836157c9f7dacfdee0">view</a> &bull; Fix link to the demo
-* <a href="http://github.com/snipe/snipe-it/commit/ff23616bb56cdc83e0f3aadc97ab6288c42ee42e">view</a> &bull; Fix #712 - Change RTD to Deployed if checkedout
-* <a href="http://github.com/snipe/snipe-it/commit/92a4f025d83e1aed2cdd041296f5d46fc61c39eb">view</a> &bull; Fixes #718 - uppercase state/country abbreviations
-* <a href="http://github.com/snipe/snipe-it/commit/46781c94cd9bcc49e7cc1e1fb9be309d4d690f0d">view</a> &bull; Fix #715 - Missing $modelCheck api call
-* <a href="http://github.com/snipe/snipe-it/commit/6b853750e59eacbb13ab3ef7ed403be4702e701c">view</a> &bull; Fix for strict mode app install
-* <a href="http://github.com/snipe/snipe-it/commit/e4b45231ecfa34b4f504db42f3f18c4440f0085a">view</a> &bull; Fix for bad seed data if Jon Doe doesn't get created
-* <a href="http://github.com/snipe/snipe-it/commit/33e7ce67616e8153785516ceca7423257bca9718">view</a> &bull; Fixes for #722 localization
-* <a href="http://github.com/snipe/snipe-it/commit/c88ce0d14d605d74b297f18bf55533218ed445bf">view</a> &bull; Fixes for #722 datatables
-* <a href="http://github.com/snipe/snipe-it/commit/efba1b90386b6481b9679a2ec8ddc85d1bd6d7d3">view</a> &bull; Fix update button to goto right group
-* <a href="http://github.com/snipe/snipe-it/commit/9de083afa78d5e76e289007423cb74b05371efc9">view</a> &bull; Merge pull request #734 from snipe/depreciation_fix2
-* <a href="http://github.com/snipe/snipe-it/commit/1a4f148318ca325bad1e042aeb7514933faeff7a">view</a> &bull; Fix #737 -Only display comma & address2 if not Null
-* <a href="http://github.com/snipe/snipe-it/commit/ba58e718b4af2e2f60138e0b6fb3f6f6985f30e0">view</a> &bull; Resolved some deps from vendor changes
-* <a href="http://github.com/snipe/snipe-it/commit/1c2e5ecc0f9460bc23f3c0e6ee44774263d08bd6">view</a> &bull; Remove space after concat to fix SQL FUNCTION CONCAT NOT EXIST error
-* <a href="http://github.com/snipe/snipe-it/commit/564d5fcb31689ab22405cd56ff402af097e1af7a">view</a> &bull; Merge pull request #770 from southwolf/fix-concat-space
-* <a href="http://github.com/snipe/snipe-it/commit/b4b273fc43a0e1a6d6b5bc128b42fe0f093735f1">view</a> &bull; Fixed typo
-* <a href="http://github.com/snipe/snipe-it/commit/6a7fcd5c40b201cc0744eab8b73bd66bfa8e33aa">view</a> &bull; Fixes #769 - set sort order for Accessory Category
-* <a href="http://github.com/snipe/snipe-it/commit/d61506fcf7d8e368febb9bfbc3a404fde6374ca8">view</a> &bull; Fixes for #766 - add activity report
-* <a href="http://github.com/snipe/snipe-it/commit/9841dbbbc42c182f98d561cc319175973a55b789">view</a> &bull; Fixed HTML so settings are saved correctly
-* <a href="http://github.com/snipe/snipe-it/commit/a0fce2e0fb9f005c1dcdccccfb346ca1da72640a">view</a> &bull; Fixes #766
-* <a href="http://github.com/snipe/snipe-it/commit/3b491d4a6bc02b3a0b46e8eae6804879a119f56e">view</a> &bull; Fixes #757 - use showAssetName method
-* <a href="http://github.com/snipe/snipe-it/commit/767e2c69f324d32e0a49e0a386bd14640ad0304e">view</a> &bull; Fixes #751 - ignore whether depreciation was selected or not to display purchase cost
-
-
-###  v1.2.6.1 - Released Mar 12, 2015 08:25:28
-* <a href="http://github.com/snipe/snipe-it/commit/7047af44f6544d2eeed0f0fcefdbdd44489f189a">view</a> &bull; Fixed layout for remember me button
-* <a href="http://github.com/snipe/snipe-it/commit/4502582beb064ffeee4a1cdf892f513e58534014">view</a> &bull; Trying to fix pre-commit hook :(
-* <a href="http://github.com/snipe/snipe-it/commit/61b04d6e40baa9054e1701455259d8d62fa868ff">view</a> &bull; Fixes #579 - user cannot accept more than once
-* <a href="http://github.com/snipe/snipe-it/commit/2d196b1595ec87f119ad5a82f8f676918c52c896">view</a> &bull; Fixes #602 for strict_mode
-* <a href="http://github.com/snipe/snipe-it/commit/2540e90c37f37515d8d0277a4152c4b8198a4222">view</a> &bull; Fixes #605 - hides user requestable view from admins
-* <a href="http://github.com/snipe/snipe-it/commit/1c333e4a24a4950418175a8c354d7541637b7658">view</a> &bull; Fixes #596 - better routes for checking in multiple items from user
-* <a href="http://github.com/snipe/snipe-it/commit/7d5ee9750f912d85ac0c7f42e2beaba7e026989c">view</a> &bull; Added #596 fix for accessories
-* <a href="http://github.com/snipe/snipe-it/commit/3f9d9f23d5190052deb1f36be919c650e8f773b8">view</a> &bull; Fixes #280 - updated link to use config url
-* <a href="http://github.com/snipe/snipe-it/commit/817384b7615a301d6d692aefe6e41cd92ecfd6e1">view</a> &bull; Fixes #597 - print-friendly view on users
-* <a href="http://github.com/snipe/snipe-it/commit/2115c82587e06049245f17f9d710fbc7a61e57b9">view</a> &bull; Fixed DB format for nullable EULA
-* <a href="http://github.com/snipe/snipe-it/commit/f62f22b4bf1399c3b98041dfe17f4cc8450847b2">view</a> &bull; ref #599. showing groups in user detail view. fixes a small design bug with group edit view
-* <a href="http://github.com/snipe/snipe-it/commit/ad25c048c4a52a7f80a479a3b7d621aaad18b1d7">view</a> &bull; Updated Sentry version to fix #625
-* <a href="http://github.com/snipe/snipe-it/commit/d31c12cfafb2ba323973964215f033bd9aeb1f9b">view</a> &bull; Merge pull request #629 from uberbrady/unicode_fix
-* <a href="http://github.com/snipe/snipe-it/commit/33dd59fb814089c81886c0264b2356df2b212864">view</a> &bull; Fix #637 - Remove Deleted Models from drop down
-* <a href="http://github.com/snipe/snipe-it/commit/cb171bcac5c4ccbb347f370e3d2b28783378c0b2">view</a> &bull; Fixes #645 - adds zip and rar to filetype
-
-
-###  v1.2.6 - Released Feb 28, 2015 08:27:45
-
-
-###  v1.2.6-beta - Released Feb 27, 2015 03:17:06
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/30df21c7aa2582bc3b1efbfd788c1aea2733aa7d">view</a> &bull; Fixed missing checkedout-to info on asset view
-* <a href="http://github.com/snipe/snipe-it/commit/70ae59ed6260101bcfb6e3cbd6309ecb9c1c935a">view</a> &bull; Fixed a bug when no assets are in table that the autoincrement method blows up. Also optimzed the logic to get max id instead of popping top off creation date.
-* <a href="http://github.com/snipe/snipe-it/commit/f8e12cabd4af8875abd759a3c9d6c2216cb88601">view</a> &bull; Fixes #476 - added logo upload and header color
-* <a href="http://github.com/snipe/snipe-it/commit/f85061f988a946f1d4a284fbfc8c442636c1364c">view</a> &bull; Fix #541 - Headers not being skipped if checked
-* <a href="http://github.com/snipe/snipe-it/commit/8b3e22b58e080b44e4de809b8598283fa6ba5bb0">view</a> &bull; Fixes #546 - only insert data if values exist
-* <a href="http://github.com/snipe/snipe-it/commit/083cb1b5ec51aa2b6932a59b9436a1a45fad5460">view</a> &bull; Fix activate for strict db
-* <a href="http://github.com/snipe/snipe-it/commit/35cf5b3d609fec2bc3613bdae42d338448413520">view</a> &bull; Fixes #423
-* <a href="http://github.com/snipe/snipe-it/commit/097bb38a231795aa52ff772a38887700e828256d">view</a> &bull; Fixes #163 - accept acceptance + eula
-* <a href="http://github.com/snipe/snipe-it/commit/b2af455523fcca1bb02018b38fdb6dc4861819d8">view</a> &bull; Merge conflict resolution. Added a use at the same line as remote. Fixed
-* <a href="http://github.com/snipe/snipe-it/commit/8879bff16084b2cfa0280fcb1f83d3f90368797f">view</a> &bull; Fixed bug for reporting on upload in dashboard
-* <a href="http://github.com/snipe/snipe-it/commit/3135869d5a3fafcf70e49dcbb99e36c2ec04ddd0">view</a> &bull; Fixed font path
-* <a href="http://github.com/snipe/snipe-it/commit/a5a1c4223b357b9cc2751a28e0c4e3085e476733">view</a> &bull; Fixed chevrons
-* <a href="http://github.com/snipe/snipe-it/commit/734dc49564e4f970846f786177c9d2928284fb5f">view</a> &bull; Fixed icon
-* <a href="http://github.com/snipe/snipe-it/commit/a6232cbfd8050ace613259df56afae243954c625">view</a> &bull; Fix language string for create accessory
-* <a href="http://github.com/snipe/snipe-it/commit/c2bbc1281ccdda65caa55665c66c78613142099f">view</a> &bull; Mobile fixes
-* <a href="http://github.com/snipe/snipe-it/commit/29863004e2e622a9b3b4616abdcd92f2b950bebe">view</a> &bull; more small mobile fixes
-* <a href="http://github.com/snipe/snipe-it/commit/8eaa70c39b3ace90a517387dc91f452aede18958">view</a> &bull; Fixes #567 - bug in depreciation report csv export
-* <a href="http://github.com/snipe/snipe-it/commit/e41621def05994302627cd4a6a81abd8e43c86be">view</a> &bull; Fixed relation between accessory and category
-* <a href="http://github.com/snipe/snipe-it/commit/9f3edd701b51a7aecf792e5736534c1bb15aca9a">view</a> &bull; Fixes #565 - Soft Delete Models and Allow Restore
-* <a href="http://github.com/snipe/snipe-it/commit/528c06cf7fb4f5c35d4b90eb256c0d195b8366b7">view</a> &bull; Reverting icon fix
-* <a href="http://github.com/snipe/snipe-it/commit/1ac401f0c036eca0cec1df0986d4c7e1903556fa">view</a> &bull; Fixed EULA mail
-* <a href="http://github.com/snipe/snipe-it/commit/6d16c97902dadad2351b627f3157257774a075f3">view</a> &bull; Fixed back arrow
-* <a href="http://github.com/snipe/snipe-it/commit/3e189d3502f8147c012b641cc366394875e9005c">view</a> &bull; Fixes #538 - sortable tables
-* <a href="http://github.com/snipe/snipe-it/commit/31df29cac878deeb75d8b9b5a2efc7c84ef4b592">view</a> &bull; Fixed funky layout from datatables
-* <a href="http://github.com/snipe/snipe-it/commit/efaf067b948899d0b784f47092dc3bc22fe504ca">view</a> &bull; Fixed user relationship
-* <a href="http://github.com/snipe/snipe-it/commit/5010720a976019306e37b89f5aa0e917c0ffdea3">view</a> &bull; Fixed accessory relationship
-* <a href="http://github.com/snipe/snipe-it/commit/a20e1f6943eab11fc937fcfeb3fe99dc0d520734">view</a> &bull; Fixed attach to relation
-* <a href="http://github.com/snipe/snipe-it/commit/19ad8970d76a1676de3494b758efa65c0ed6a5c1">view</a> &bull; Fixed arrow icon
-* <a href="http://github.com/snipe/snipe-it/commit/430b8233ed6f23402597fe54215b9988a3405dd7">view</a> &bull; Fixed user relationship
-* <a href="http://github.com/snipe/snipe-it/commit/c0c563b1c77ff9942212af89384c8ded40b83b29">view</a> &bull; Fixes accessory relationshop for pivot
-* <a href="http://github.com/snipe/snipe-it/commit/ef6eae63d86f159a170c3a322a44e08bab827080">view</a> &bull; Fixed error icon
-* <a href="http://github.com/snipe/snipe-it/commit/d33dcbbcb12172527cec977f679198f594ac975b">view</a> &bull; Fixed bad method call in accessories on delete
-* <a href="http://github.com/snipe/snipe-it/commit/04735f1affd2fdff9d6cf96ed583ece895cfb341">view</a> &bull; Fixed assetlog display
-* <a href="http://github.com/snipe/snipe-it/commit/c484afb12b0720eaba2d28f501bf547e2ad9caa9">view</a> &bull; Fixed typo for accessories accept
-
-
-###  v1.2.5 - Released Feb 18, 2015 03:18:10
-* <a href="http://github.com/snipe/snipe-it/commit/00f7717142e11b90764ffce2d554c566f8ad219f">view</a> &bull; Fix #475 and styling
-* <a href="http://github.com/snipe/snipe-it/commit/49f25a23a99c08606d58101e039a885b89503fa7">view</a> &bull; Merge pull request #516 from splaer/fix-475
-* <a href="http://github.com/snipe/snipe-it/commit/58ff929d7193b054073ef46ae2fafdef51d51919">view</a> &bull; Fixes error when no model present because new asset
-* <a href="http://github.com/snipe/snipe-it/commit/f57c61dd4d789635cee6f62899807b1a7928800e">view</a> &bull; Possible fix for #518 - license count issue
-* <a href="http://github.com/snipe/snipe-it/commit/064c0211dbb310d1dfdb126e3ce2cee72a80f628">view</a> &bull; Fix #517 - User Requestable Assets
-* <a href="http://github.com/snipe/snipe-it/commit/4a5007264e1712250726047162df91041d12d28c">view</a> &bull; Fixed mac address not showing
-* <a href="http://github.com/snipe/snipe-it/commit/17258b73a1c09918960d894702a0ae341a18f0b8">view</a> &bull; Fixes #520 - state no longer required
-* <a href="http://github.com/snipe/snipe-it/commit/f40bb7b8b3a17ff772c797a3f91a845b068be3d2">view</a> &bull; Fixes #520 postal code requirement
-* <a href="http://github.com/snipe/snipe-it/commit/08ee02d0cd4d1ff9ed2b0600b75390c1e34c1f53">view</a> &bull; Fixes #525 - added serial to asset model UI
-* <a href="http://github.com/snipe/snipe-it/commit/24f5cdc743acd55ead02282e13e07f3cbd3551b0">view</a> &bull; Fixes #523 - added file uploads to assets
-* <a href="http://github.com/snipe/snipe-it/commit/e02bea4275306fb3d2696e3018066b4b1486fa8d">view</a> &bull; Fixes #457 - added bulk options to hardware
-* <a href="http://github.com/snipe/snipe-it/commit/4e4144ea749974332f645fa77eb74fbbfef51b90">view</a> &bull; Fixed blade reference
-* <a href="http://github.com/snipe/snipe-it/commit/b32d74de57a3a26326a220236838f57550549ca5">view</a> &bull; Fixed seeder with duplicate ID
-* <a href="http://github.com/snipe/snipe-it/commit/ea6a6d098ad1795fc5463c61b72240cdcd8a43e7">view</a> &bull; Fixes #440 - removed unique constraint on serial
-* <a href="http://github.com/snipe/snipe-it/commit/38961298ed6efe3649fdbf4b1e9b3278ab85567a">view</a> &bull; Fixes #439 - loads javascript and CSS locally
-* <a href="http://github.com/snipe/snipe-it/commit/063e5c407c8f817c16026887be16eeb42598417f">view</a> &bull; Fixed the depreciation report, fixes to calculate current depreciated value (which were only used there). Additional fixes and refactoring around Depreciable, in terms of how assets get depreciation via models, and licenses get depreciation directly.
-
-
-###  v1.2.4 - Released Feb 12, 2015 06:57:47
-* <a href="http://github.com/snipe/snipe-it/commit/2277b6ee699a78108523eee11695a280e76b1bb4">view</a> &bull; Fixed checkout logic for new assigned_to
-* <a href="http://github.com/snipe/snipe-it/commit/dbc93de6b3966470f83254547f8029c60f489490">view</a> &bull; Fixes checkin button on view
-* <a href="http://github.com/snipe/snipe-it/commit/c06a4d4118039d112b69e48f9d4efc2be796f2e0">view</a> &bull; Fixed wonky checkin/checkout buttons
-* <a href="http://github.com/snipe/snipe-it/commit/31f4ba88f655e1386f2f4f0efae84399f7aa6d52">view</a> &bull; Fix RTD query to not display checked out asset
-* <a href="http://github.com/snipe/snipe-it/commit/5867c604104781c351f870ff3e0fd4b4d6eeb35a">view</a> &bull; Fixed scope chaining on assigned_to
-* <a href="http://github.com/snipe/snipe-it/commit/a2178392e65bcc35594d516a20f67eea8466e5c1">view</a> &bull; Fixed seeder
-* <a href="http://github.com/snipe/snipe-it/commit/7715731c4a2e423afb94873227eb728ad4877221">view</a> &bull; Fix count in header
-* <a href="http://github.com/snipe/snipe-it/commit/c2e532e32e4943e251dcb5fdd005e9b65d9798a5">view</a> &bull; Fixed language file for status label messages
-* <a href="http://github.com/snipe/snipe-it/commit/f36029a34a696d89b1058c9abdca7953d51e2bc4">view</a> &bull; Fixed migration for to set assigned_to to null per #506
-* <a href="http://github.com/snipe/snipe-it/commit/f72b38579037d76b5b188c5d85e24ca567e2480b">view</a> &bull; Fix licenses so null instead of 0
-* <a href="http://github.com/snipe/snipe-it/commit/34032c73ceee7a9666680f21bf7490fdc32dbdb6">view</a> &bull; Fixed licenses so null instead of 0
-* <a href="http://github.com/snipe/snipe-it/commit/7b165a12e05396b72381fc2789124acd2b98a2b8">view</a> &bull; Fixes #508 - compacted UI for licenses overview
-* <a href="http://github.com/snipe/snipe-it/commit/c89be345033bfbed326ffd4207a63438ea09378f">view</a> &bull; Fixes #329 and #454 - added category asset view
-* <a href="http://github.com/snipe/snipe-it/commit/35a133bbf9f7330a038dda2e79995b9825ca7633">view</a> &bull; Fixes #382 - allow admins to restore deleted assets
-* <a href="http://github.com/snipe/snipe-it/commit/80e10c4c9838ae4acea8847ed907c6ad05bfac1a">view</a> &bull; Fixes #387 - sortable asset view by manufacturer
-* <a href="http://github.com/snipe/snipe-it/commit/e343c157c5998d6f30a4e25da23ad1092d50c103">view</a> &bull; Fixed naming conflict for requestable
-* <a href="http://github.com/snipe/snipe-it/commit/cd5a352961a1e1e8d90368abf81fedee5ce94bef">view</a> &bull; Fix for wrong math on remaining licenses when assigned to an asset
-* <a href="http://github.com/snipe/snipe-it/commit/342a8b81afb2060a128d0667acc15fa5caafc2ea">view</a> &bull; Fix for error when asset has null status
-* <a href="http://github.com/snipe/snipe-it/commit/8cdd2156143864974423bea70521d45db6d0cb9c">view</a> &bull; Fixed intenting
-* <a href="http://github.com/snipe/snipe-it/commit/fbf03b225d732e12821bfc83b9bae7fb7b4b8be8">view</a> &bull; Fixes #509 - added MAC address as model option
-
-
-###  v1.2.4-beta - Released Feb 11, 2015 01:11:40
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/389c27b2e691743eb361cc1fbe4ece4259ae6046">view</a> &bull; Fixes #477 - wrong sidebar on asset view
-* <a href="http://github.com/snipe/snipe-it/commit/7009b24748edab02921c609c26bc549fa96dcd2f">view</a> &bull; Merge pull request #498 from snipe/fixes/477
-* <a href="http://github.com/snipe/snipe-it/commit/c1600a33db6d4463d27f74f87389489210de700e">view</a> &bull; Fixes #499 - timestamps in asset logs
-* <a href="http://github.com/snipe/snipe-it/commit/b360736b7728d2ac872193bbe8888037c9794494">view</a> &bull; Fixes #484
-* <a href="http://github.com/snipe/snipe-it/commit/addfcd4bc5417784f95145394940f90f1302376f">view</a> &bull; Fix RTD bug
-* <a href="http://github.com/snipe/snipe-it/commit/d2438f9fdb9b281025c17e22ac2bfaa07ce04a2d">view</a> &bull; Fixes #502 - normalized statuses
-* <a href="http://github.com/snipe/snipe-it/commit/aef3a734a3530f109b82fc0897e25727293f9862">view</a> &bull; Small fix for pending status
-* <a href="http://github.com/snipe/snipe-it/commit/f175f52530e58bd5ab80139c526fc7838750cb11">view</a> &bull; Fixed spacer in sidenav for list all
-
-
-###  v1.2.3 - Released Feb 09, 2015 12:22:12
-
-
-###  v1.2.3-beta - Released Feb 07, 2015 06:02:52
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/950567e9d66a6836cbca1383d24fc8548d3cbadf">view</a> &bull; Fixes issue related to #471 - assigning to user ID 0 causes erro
-* <a href="http://github.com/snipe/snipe-it/commit/2b86f14e30c155f72b903428fd05a896ee9adfcc">view</a> &bull; Possible fix for #484 - fullname issue
-* <a href="http://github.com/snipe/snipe-it/commit/b3af102d22a2f4f147b863e0ba8c2e4064aad01a">view</a> &bull; Fixed safe mode issue with license seeder
-* <a href="http://github.com/snipe/snipe-it/commit/1db806f8b283e13dd04f20335d7087d12a04fa23">view</a> &bull; Fixes #488 - longer user jobtitle
-* <a href="http://github.com/snipe/snipe-it/commit/f5efc368a58e1b26689dadb285918b090b66eb59">view</a> &bull; Fixes #487 - maintained and purchase order in strict mode
-* <a href="http://github.com/snipe/snipe-it/commit/4dc81ce65fddced3282a9255a5a31ba8aa6a1458">view</a> &bull; Resolves #478 - redirects non-reporting users to view assets page
-* <a href="http://github.com/snipe/snipe-it/commit/cd338d2a70e1bd4dca3bc651813e51095d7155f0">view</a> &bull; Fixes #483 - line breaks in notes on view
-* <a href="http://github.com/snipe/snipe-it/commit/e67ba8a7437d4f27ae869072898e65749602f2dd">view</a> &bull; Fix reporting error on depreciation
-* <a href="http://github.com/snipe/snipe-it/commit/1aeb4de0fae723801f0cdb555c77b5ee17ae1919">view</a> &bull; Possible fix for #491 - solving for giticide on package dep
-* <a href="http://github.com/snipe/snipe-it/commit/c255edaf617872ac4a896106e56cc816209c2d5b">view</a> &bull; More travis fixes
-* <a href="http://github.com/snipe/snipe-it/commit/feeef4b66c1b6049a1f18c67e034907ea26c7da9">view</a> &bull; Fix for asset log incorrectly using soft deletes
-* <a href="http://github.com/snipe/snipe-it/commit/140bd137a48c199269d635aef57d14b1f0a4330a">view</a> &bull; Minor display fixes
-* <a href="http://github.com/snipe/snipe-it/commit/29f5b7c5e3adc994b727842730c0157429520197">view</a> &bull; Fixed datetime
-
-
-###  v1.2.2 - Released Jan 22, 2015 11:41:36
-* <a href="http://github.com/snipe/snipe-it/commit/4a77dee79c18f0e2ab155c7024234150ce98b808">view</a> &bull; Fixes #447 - added asset log entry on save
-* <a href="http://github.com/snipe/snipe-it/commit/d85e5246807e597c1efac85c368a642a6fdcf944">view</a> &bull; Fixes #451 - allows spaces in state name
-* <a href="http://github.com/snipe/snipe-it/commit/95141d49ba3c4f2b17ed6a26c20e7ad2a8aac9cb">view</a> &bull; Fixes #432 - add model name to checkout
-* <a href="http://github.com/snipe/snipe-it/commit/3787a3f4bab9908f4903abdc2951cc254c8dc911">view</a> &bull; Fixed language strings for incrementing IDs
-
-
-###  v1.2.1 - Released Jan 22, 2015 09:24:01
-
-
-###  v1.2.0 - Released Jan 22, 2015 09:24:01
-* <a href="http://github.com/snipe/snipe-it/commit/8699a90093bd27c0502dcc25f6e7d55344d54a3b">view</a> &bull; Fixed changelog
-* <a href="http://github.com/snipe/snipe-it/commit/cff24309a1514f9ea991881ca72898c7a6358562">view</a> &bull; Possibly fixes #343
-* <a href="http://github.com/snipe/snipe-it/commit/b2d5dc9ec5460ff1f02db6c1a31ea87d224de4c9">view</a> &bull; Fix #342
-* <a href="http://github.com/snipe/snipe-it/commit/74ae2fceea68d18514e87edc008cb3016361beee">view</a> &bull; Fix class on th
-* <a href="http://github.com/snipe/snipe-it/commit/fc2d472ed350d7d63fb97942d00a97b62d4bed55">view</a> &bull; Fixed english language string
-* <a href="http://github.com/snipe/snipe-it/commit/89c7159c56f88bcf8459a5eb02d79d636335cb28">view</a> &bull; Fix array check for empty rows
-* <a href="http://github.com/snipe/snipe-it/commit/7ddc6d497af13e7894031ac763939be9863889a4">view</a> &bull; Fix Report Langs
-* <a href="http://github.com/snipe/snipe-it/commit/13b173409fcd5b5ce8e79566b5110eadcf51c233">view</a> &bull; Fix License form langs
-* <a href="http://github.com/snipe/snipe-it/commit/b73ae3147a60b29ac455063ecf419a609cce2cac">view</a> &bull; Fixes #362, reduced asset name to 2 char min
-* <a href="http://github.com/snipe/snipe-it/commit/637009054cc74b17e2dd226c6f8c467eed5b0962">view</a> &bull; Fixed typo in english
-* <a href="http://github.com/snipe/snipe-it/commit/6905d82fc48998f9c95c454c8bf37a34e30c002e">view</a> &bull; Fixes #374 to keep the requirement to PHP 5.4
-* <a href="http://github.com/snipe/snipe-it/commit/102481631330fbed894bf72510845bff6c88e59e">view</a> &bull; Fix #377 - Checkout users last_name, first_name
-* <a href="http://github.com/snipe/snipe-it/commit/d6a0249c60cbb026b2e3190285d50723a76f22ee">view</a> &bull; Fixed #373 - added ability to auto-increment asset tags
-* <a href="http://github.com/snipe/snipe-it/commit/1b41c974cf67c550b2cae39eeec8f90cb2da79e0">view</a> &bull; Fixes #348 - remove constraints on license keys
-* <a href="http://github.com/snipe/snipe-it/commit/89a2b87e42c18b308835ef71d196b91002b451ef">view</a> &bull; Fixes #367 - added model number to dropdown
-* <a href="http://github.com/snipe/snipe-it/commit/64c16a0bacfcde7c4d92971f2129f1b1aeac2c0e">view</a> &bull; Fixes #386 and #273 - altered column type to text
-* <a href="http://github.com/snipe/snipe-it/commit/daefc86e5878a21f9909806599f22198360c1f9b">view</a> &bull; Formattig fixes for #386
-* <a href="http://github.com/snipe/snipe-it/commit/73dd339772fcc35e50603ded115f67714620da69">view</a> &bull; Fix #388 - License not showing checked out in view
-* <a href="http://github.com/snipe/snipe-it/commit/0663ccb99fa926ff944dded330ba1f0cd95abbb3">view</a> &bull; Check if ->adminuser->id isset before trying to print the fullName so we can catch when a user that created an asset has been deleted. Fixes #349
-* <a href="http://github.com/snipe/snipe-it/commit/533be7f942cb6dfccd1e8a79c043d61791e4c54b">view</a> &bull; fixed #435. using namespace with route groups to increase the readability
-* <a href="http://github.com/snipe/snipe-it/commit/e434616db83a8d693af63b4705e1b24476fc3c17">view</a> &bull; Merge pull request #436 from rashivkp/fix-435
-* <a href="http://github.com/snipe/snipe-it/commit/5e496672c66428a1bbd37772aabd44f8bb1cb0fa">view</a> &bull; Fixes #469
-* <a href="http://github.com/snipe/snipe-it/commit/3c141e8f5017e8f161b6fd1fb82b288283b8450c">view</a> &bull; Fixes #467
-* <a href="http://github.com/snipe/snipe-it/commit/548de1a1a217e6b5c6fcbbf6cd4918f078e64542">view</a> &bull; Fixes #468 - updated ordering on license checkout
-
-
-###  v1.1 - Released Nov 06, 2014 02:16:26
-* <a href="http://github.com/snipe/snipe-it/commit/fafd03f00f49cb9ffe81d50aa9ca3d1f1fa1d043">view</a> &bull; Added DB Prefix to Migrations
-* <a href="http://github.com/snipe/snipe-it/commit/309772e67d62989f1f60141a4a10d724a44c6baa">view</a> &bull; Fixed operator for setting bool display
-* <a href="http://github.com/snipe/snipe-it/commit/22f81912e416cfe1227a08b5d8b6323e32e1ef36">view</a> &bull; Fixes #299
-* <a href="http://github.com/snipe/snipe-it/commit/86b7b6946f1e1bd404127e228c615e4abe0b20fb">view</a> &bull; Fixes #316 - added model name back to view
-* <a href="http://github.com/snipe/snipe-it/commit/9e85dcb9fcb4cc932ecddd23caa6b51e83110543">view</a> &bull; Fixes #315 - add EOL as display option in settings (run migrations)
-* <a href="http://github.com/snipe/snipe-it/commit/ee35948980c22f9256241c02d7febd90275f6229">view</a> &bull; fix div issues
-* <a href="http://github.com/snipe/snipe-it/commit/0022389463e251e73402450cfbc280cb05633bd1">view</a> &bull; Fix dropdown menu position
-* <a href="http://github.com/snipe/snipe-it/commit/343798d241172707145ef365445062db9bb6b99a">view</a> &bull; Merge pull request #322 from madd15/fix-js-delete-asset
-* <a href="http://github.com/snipe/snipe-it/commit/1078dbf5c5f6a5bec1a2ef864cebfcc7883d31e6">view</a> &bull; Fixes #324
-* <a href="http://github.com/snipe/snipe-it/commit/6b2d3efe3e76429c9c2f5de78f04c4f7e2748a3d">view</a> &bull; Fixes #237 - reporting-only group
-* <a href="http://github.com/snipe/snipe-it/commit/e04cc806d9209b54a1833172ebb66ab55b5f0c06">view</a> &bull; Fixes #327
-
-
-###  v1.0 - Released Oct 16, 2014 09:46:47
-* <a href="http://github.com/snipe/snipe-it/commit/a4b220d6c31c97f6504023f0b52527825a4cd897">view</a> &bull; Fixed #191 - allow admins to assign a user during asset creation
-* <a href="http://github.com/snipe/snipe-it/commit/dc1033025a0bc1b2d657e06c89058c3ab95f2c59">view</a> &bull; Fixed #151 - more complete translations
-* <a href="http://github.com/snipe/snipe-it/commit/56d619b218794b43d8c6b182c89c75f83af9dcd9">view</a> &bull; Fixed missing language string
-* <a href="http://github.com/snipe/snipe-it/commit/69fca5d1eda0e5f26d2085f7eebc08fafd84a3ae">view</a> &bull; Fixed #58
-* <a href="http://github.com/snipe/snipe-it/commit/8197e6174e9f12bcfddd94c6bf606ee36e6801bf">view</a> &bull; Fixes #200
-* <a href="http://github.com/snipe/snipe-it/commit/cb8369e9de96aaf1cf9108e22f4038fa6486b881">view</a> &bull; Initial QA Patch to fix errors Add License Add Asset Show Deleted Users License Assign
-* <a href="http://github.com/snipe/snipe-it/commit/62a3ed671bbd957075563933f49e8a5445042737">view</a> &bull; DB migration, layout and clone fixes
-* <a href="http://github.com/snipe/snipe-it/commit/9ccc7d756f9361757eafc1dce9684ee9f5ecc1c3">view</a> &bull; A0.4.2: Added asset, license, user, model cloning and fixed some bugs.
-* <a href="http://github.com/snipe/snipe-it/commit/652f1c746c4757dce9d33d7bd90a9357822c4656">view</a> &bull; Fixes Travis CI build
-* <a href="http://github.com/snipe/snipe-it/commit/363d084bd623f778cd72ca7d385a4fb2f67ef474">view</a> &bull; Fixed DB name in travis CI
-* <a href="http://github.com/snipe/snipe-it/commit/49c5607e1c8a82a3111123ad84b537644546ebb3">view</a> &bull; Fixes #222
-* <a href="http://github.com/snipe/snipe-it/commit/96e40d72b9ac3f74b94b0e39b6f296f0f0b2a1f4">view</a> &bull; fix typo: artisand -> artisan
-* <a href="http://github.com/snipe/snipe-it/commit/e978038cc044f60c2eca71b6319063009a57886f">view</a> &bull; Merge pull request #234 from burlito/typo-fix
-* <a href="http://github.com/snipe/snipe-it/commit/a829fcf52f933d087c3776993b42311ec9a8988e">view</a> &bull; fix: Use the old asset tag when cloning
-* <a href="http://github.com/snipe/snipe-it/commit/ee7d9bec7082dc2e60a4797dea84a0b7443c8090">view</a> &bull; Fixes #279 - QR checkbox not staying checked
-* <a href="http://github.com/snipe/snipe-it/commit/bf1e07555160ede517d41f649d6b1d0911f89dd2">view</a> &bull; Fixes #87 - made datatables responsive
-
-
-###  v0.3.11-alpha - Released Jul 19, 2014 05:16:53
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/ac4c905c42d920d2cf8455d644f4c65332a81d0d">view</a> &bull; Fixed #140
-* <a href="http://github.com/snipe/snipe-it/commit/4a13cded607415d749151cef495332c48c58cf86">view</a> &bull; Fixed path for Travis composer
-* <a href="http://github.com/snipe/snipe-it/commit/ddf946ad5eb6dd8480eeaa709f82af75e0c61444">view</a> &bull; Tried to fix failing build caused by travis composer
-
-
-###  v0.3.10-alpha - Released Jul 17, 2014 05:54:10
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/89a8f3c277d2482b2cd04c4c5c582c9e507770f8">view</a> &bull; Fixes #183 - added employee number to users
-* <a href="http://github.com/snipe/snipe-it/commit/a7b809cb91f49fb2c8eaecc67822fa155a0f20ce">view</a> &bull; Updated title/header for users, additional fixes for #151
-* <a href="http://github.com/snipe/snipe-it/commit/5266d9a30a9663fa80ff764b25ff71726e5c4f4c">view</a> &bull; Fixed title tag for user list view
-* <a href="http://github.com/snipe/snipe-it/commit/43485e1a51330ef585a65b469d7eb85ae7bde13a">view</a> &bull; Fixed language definition
-* <a href="http://github.com/snipe/snipe-it/commit/6b5a552d95ff6f6d5567275b50fcd487fb793820">view</a> &bull; Fixed #186 - Bug with select box not retaining selections on edit screen
-* <a href="http://github.com/snipe/snipe-it/commit/90eb883b671919ea360122c2bf44433995a12144">view</a> &bull; Fixed #187 - replaced dummy site name with site name from admin panel preferences
-* <a href="http://github.com/snipe/snipe-it/commit/f22f23f21dc11d393854849580f0c1229cec9827">view</a> &bull; Fixed button label on forgotten password page
-* <a href="http://github.com/snipe/snipe-it/commit/2b9494ed8271254f8f84e016f238d518e6109842">view</a> &bull; Fixed inconsistent password requirements across admin user creation, user profile and forgotten password
-* <a href="http://github.com/snipe/snipe-it/commit/9dc40a3a9c161267fd8c88aacc1fbf536c1ec2de">view</a> &bull; Fixed a few CSS quirks
-* <a href="http://github.com/snipe/snipe-it/commit/99003e126a8fd0ad9aaea5a550e0af5e306fc1bb">view</a> &bull; Fixed bug with edit (supplier_id), added requestable field for assets
-* <a href="http://github.com/snipe/snipe-it/commit/21251b462308f2d783b83be1a331a0faf0813d16">view</a> &bull; Fixed #190, where depreciation on licenses would not be saved
-* <a href="http://github.com/snipe/snipe-it/commit/89000440f344f766a31adc69718d7f66df235abf">view</a> &bull; Added admin ability to unsuspend locked accounts #changelog
-* <a href="http://github.com/snipe/snipe-it/commit/e203fc516fadf6218f5ce87c070d0cdba9fca188">view</a> &bull; Fixes #194
-
-
-###  v0.3.9-alpha - Released Jul 03, 2014 02:08:38
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/2825bcb4310899e89ccbc73dfa8b59ade28018da">view</a> &bull; Fixed #179 - account page to show assets checked out to the logged in user
-* <a href="http://github.com/snipe/snipe-it/commit/c782f29f5aae752a6246be9778d418df172dd4f6">view</a> &bull; Pulled account sub-nav into top menu to free up UI space. #changelog
-* <a href="http://github.com/snipe/snipe-it/commit/fad2ec66fa9abe0b34baf16cce453a7e9fc9e4d4">view</a> &bull; More README fixes and refinement
-
-
-###  v0.3.8-alpha - Released Jun 27, 2014 09:28:22
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/3e7a9e45d1954531bbc3b73f2ed59dd16d59c657">view</a> &bull; Fixes PR #168 and #167
-* <a href="http://github.com/snipe/snipe-it/commit/945cb3253f1349e30aafa4e7cb57bb507a2ea0cc">view</a> &bull; Fix #117
-* <a href="http://github.com/snipe/snipe-it/commit/6f42b3045e2a65cdf98ec1038284cc2ecf01fa5d">view</a> &bull; Resolves #155
-* <a href="http://github.com/snipe/snipe-it/commit/380417953b6b67a506f0cc395fd2dfb744cf26cd">view</a> &bull; Fixed missing string
-* <a href="http://github.com/snipe/snipe-it/commit/b09aec67f1ab76ff0435a2e1e49b179c3d73bc12">view</a> &bull; Fixes #155
-* <a href="http://github.com/snipe/snipe-it/commit/124acc89c4027e346daf54c62cb38b85586de870">view</a> &bull; Resolves #174
-* <a href="http://github.com/snipe/snipe-it/commit/afabd2814205fdcd83b7bf9ce9095aa367b08311">view</a> &bull; Additional fixes for #167
-* <a href="http://github.com/snipe/snipe-it/commit/a170efae2796314896d548d86b79d89d859c37d2">view</a> &bull; fix for #167
-* <a href="http://github.com/snipe/snipe-it/commit/ec9eab81bfb3b35bfe7ad06008b26f19009e6638">view</a> &bull; Closes #177 - change log file added, needs refining
-
-
-###  v.0.3.5-alpha - Released Jun 20, 2014 02:23:09
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/d1499deecdff3c7a4235ffdfad5adbddc1a5098f">view</a> &bull; Provisions for strict mode, fixed license deletion bug
-
-
-###  v.0.3.4-alpha - Released Jun 19, 2014 10:27:59
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/08d05b481f6366ad48fcdce72a8df53755f5dee8">view</a> &bull; Fixes #158
-
-
-###  v.0.3.3-alpha - Released Jun 18, 2014 08:04:46
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/3518ab9f55f7992d6d4f886389d67b062a02f2d8">view</a> &bull; Fixes #139
-* <a href="http://github.com/snipe/snipe-it/commit/ad9b1fc446ab15157502fe7c52ddbda455e3ea8f">view</a> &bull; Fixes #139
-* <a href="http://github.com/snipe/snipe-it/commit/dfa5d1c64205b23c4c3d16190d1478da8aa0edbb">view</a> &bull; Fixes #136
-* <a href="http://github.com/snipe/snipe-it/commit/9714178ce1fa1e2814389e4b6b82eb596a650084">view</a> &bull; Fixes #141
-* <a href="http://github.com/snipe/snipe-it/commit/607484b29407718238571eb5269c9c27830338f7">view</a> &bull; Fixes #141 for mysql with strict mode enabled
-* <a href="http://github.com/snipe/snipe-it/commit/cbc945299e7f67f5f10dfdc6a875e5c53ac8440a">view</a> &bull; Fixes #148
-* <a href="http://github.com/snipe/snipe-it/commit/dc256583d410cb09253e30b075149c79fb4864e5">view</a> &bull; Fixes #144
-* <a href="http://github.com/snipe/snipe-it/commit/610c405aa50118163ad5d26d43e4bf6c2456f624">view</a> &bull; More fixes for #151
-
-
-###  v.0.3.2-alpha - Released May 06, 2014 08:26:21
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/f4c5da57d0397877d90aa398267e59fcffee7b47">view</a> &bull; Fixed auth error when user isn't logged in
-
-
-###  v.0.3.1-alpha - Released May 06, 2014 04:48:09
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/efad5db082d1461ea26556fad2f1671a49dc1480">view</a> &bull; Fix for broken datatables in upgrading to v2.2
-* <a href="http://github.com/snipe/snipe-it/commit/5690e9ce1f178486179ce6cdfb00ca417acd87dd">view</a> &bull; Fixed code indentation for Apache virtualhost example
-* <a href="http://github.com/snipe/snipe-it/commit/67aba76d3f83c5f374c05fe07d52eebd81d13278">view</a> &bull; Fixing this change from #109 that somehow got reverted
-* <a href="http://github.com/snipe/snipe-it/commit/06067fc19c0127fdcbb78541e7cdc8e77f5444ac">view</a> &bull; Fixed CSV rexport
-
-
-###  v0.3.0-alpha - Released Jan 29, 2014 01:28:31
-#### This is a pre-release
-* <a href="http://github.com/snipe/snipe-it/commit/14972f894bb0e761e2d0170a2c93c9aac4edfca6">view</a> &bull; fixed typo
-* <a href="http://github.com/snipe/snipe-it/commit/79da13dff767d57f6f4fbb12f195e25f409ee5ec">view</a> &bull; Fixed layout for category view
-* <a href="http://github.com/snipe/snipe-it/commit/0e4e26206bdcc164e5df586368ed45edd45b9a74">view</a> &bull; fixed broken redirect route
-* <a href="http://github.com/snipe/snipe-it/commit/9364c46c2df79c0de07dc5dbb724a3c44485b739">view</a> &bull; Fixed licensed link
-* <a href="http://github.com/snipe/snipe-it/commit/4f0a1789db01f12ebc4bd47e7e0594bf67b64daf">view</a> &bull; Fixed license blades
-* <a href="http://github.com/snipe/snipe-it/commit/27514f85c3ba9056c4609774a482a58605f4d8cf">view</a> &bull; Fixed typo in variable name
-* <a href="http://github.com/snipe/snipe-it/commit/ffe786f659e3e8c5b91c27cd33cb77b6d24d3545">view</a> &bull; Fixed routes.
-* <a href="http://github.com/snipe/snipe-it/commit/cf59ec8c67e142c0612fb7797448057b19af5cfa">view</a> &bull; Fixed pagination bug
-* <a href="http://github.com/snipe/snipe-it/commit/76ac39115347dabac8ada21d981494a3edf7a29c">view</a> &bull; Fixed edit bug where new Category was invoked twice
-* <a href="http://github.com/snipe/snipe-it/commit/940281dd4dd0a69b900a052c0bb84e24dde89666">view</a> &bull; Fixed bug on validation display
-* <a href="http://github.com/snipe/snipe-it/commit/31d323fb71fcbe94f17f0a2b38183709e8c77151">view</a> &bull; Cosmetic fix on form
-* <a href="http://github.com/snipe/snipe-it/commit/8f86ec9dae58cef27387b028f70c8116d649b425">view</a> &bull; Change depreciation to be by month; formatting fixes.
-* <a href="http://github.com/snipe/snipe-it/commit/4da2bccbf78a0b630267c6ed75f3a1bd8100e20d">view</a> &bull; Merge pull request #27 from snipe/depreciation_fix
-* <a href="http://github.com/snipe/snipe-it/commit/7bc7ffb72813cd176658d536bbdd6be0faa9a45c">view</a> &bull; Fixed some error reporting/required fields around checkout/checkin
-* <a href="http://github.com/snipe/snipe-it/commit/48e180c6910d30732559b0cc077fce679344f56e">view</a> &bull; Fixed asset bug caused by unique validation in assets model
-* <a href="http://github.com/snipe/snipe-it/commit/57107dceeee81e8618198da33af79fe66bde0d9e">view</a> &bull; Fixed checkin text
-* <a href="http://github.com/snipe/snipe-it/commit/7b59f42fb03ee5017c11cf32abc8a23c3f5d2141">view</a> &bull; Fixed pagination bug, styled buttons
-* <a href="http://github.com/snipe/snipe-it/commit/ffdb4b1aa8dde9942f7c3b110e9a68006779998b">view</a> &bull; Fixed wonky layout issue
-* <a href="http://github.com/snipe/snipe-it/commit/3401fee672d796f4aca8dafced6917c7caf87866">view</a> &bull; Another table fix
-* <a href="http://github.com/snipe/snipe-it/commit/ddfd69e5100b19bb05d6b76cb9fad3dbadad1921">view</a> &bull; More table fixes
-* <a href="http://github.com/snipe/snipe-it/commit/5c43caf0579a26c1604fc81f5cbdf8f0d43c157d">view</a> &bull; More table fixes
-* <a href="http://github.com/snipe/snipe-it/commit/44ba90f9f0a968999a743c35dd2bf153c2edbf1d">view</a> &bull; Fixed icon set to white in main nav
-* <a href="http://github.com/snipe/snipe-it/commit/719c36d482cc67f1513351672eda057519f7f735">view</a> &bull; migration to fix a few fields in the log table
-* <a href="http://github.com/snipe/snipe-it/commit/5b27a34f050646467a178ff780efc80036aadf1b">view</a> &bull; Fixed fieldname in userlog
-* <a href="http://github.com/snipe/snipe-it/commit/76da83cbe1c4334380bb996a40cc374ab4ec12e9">view</a> &bull; Fixed links to edit/checkout
-* <a href="http://github.com/snipe/snipe-it/commit/d6a718e99766829e700760c2266b62ad37cdb66b">view</a> &bull; Fixed bug in views for created_at date
-* <a href="http://github.com/snipe/snipe-it/commit/0ee08e47e9f2b144084703142ae5eb099090476d">view</a> &bull; Fixed fatal error if admin who created the asset was deleted. (This should never happen, but...)
-* <a href="http://github.com/snipe/snipe-it/commit/61cceb5f0b44e7f2a82ccca44be2bc42e8825156">view</a> &bull; Fixed open tag in CSS
-* <a href="http://github.com/snipe/snipe-it/commit/c93469c465c0ce8a291d595ac8ccbafbfc68c71a">view</a> &bull; Fixed query for asset/license header boxes
-* <a href="http://github.com/snipe/snipe-it/commit/d46556a83d5335913b8b7fe8558f416540290343">view</a> &bull; Fixed phone display if no value set
-* <a href="http://github.com/snipe/snipe-it/commit/fc8c3c086ca70a513cd3fff39275fcf035cead5a">view</a> &bull; fixed #37
-* <a href="http://github.com/snipe/snipe-it/commit/52020d09f034c9de78b798725c0f3700d0253beb">view</a> &bull; Fixed bomb when asset is unassigned
-* <a href="http://github.com/snipe/snipe-it/commit/1b1efec858e8e0cfc5cfafc63bfb537e45191cd1">view</a> &bull; Fixed foreign key in assets
-* <a href="http://github.com/snipe/snipe-it/commit/b7251d9992401c04a5da1771af0fcddad2754362">view</a> &bull; Fixed potential bug in blade
-* <a href="http://github.com/snipe/snipe-it/commit/9249786a25bc166bf5341f59a11d644cf4f6425c">view</a> &bull; Fixed status display
-* <a href="http://github.com/snipe/snipe-it/commit/c32d45e90142b41b567a350af6d399af67994a02">view</a> &bull; Fixed ID
-* <a href="http://github.com/snipe/snipe-it/commit/2203789f4c5310599a94799bb3ead9ff9c1ce802">view</a> &bull; Fixes #41
-* <a href="http://github.com/snipe/snipe-it/commit/03edbc008c671c868fced94a7761683309d9ab8b">view</a> &bull; Fixes #43
-* <a href="http://github.com/snipe/snipe-it/commit/2b088a3fb2ea7711f66e4a887882b17f401ba4bc">view</a> &bull; Fixes #17
-* <a href="http://github.com/snipe/snipe-it/commit/ad680a337e50638b4b9865e42e4ea7e453c4151b">view</a> &bull; Fixed column name spelling in DB
-* <a href="http://github.com/snipe/snipe-it/commit/718236b2d4bedeaaad80cc601e3e91a3229e81fa">view</a> &bull; Fixed #9
-* <a href="http://github.com/snipe/snipe-it/commit/3cc0ed87438b632679ce8b61a7ea0fae48999438">view</a> &bull; Fixed sorting weirdness
-* <a href="http://github.com/snipe/snipe-it/commit/57d0f3643518190f0b4a6fe33ac6d83eda647119">view</a> &bull; Fixes #4
-* <a href="http://github.com/snipe/snipe-it/commit/3ea0ad87c8733ce1bac0e9c10c2cdaf3254743d5">view</a> &bull; Fixes #22
-* <a href="http://github.com/snipe/snipe-it/commit/e87e5b9cae19bfd06b815cf01be309d665409828">view</a> &bull; Fixes #46
-* <a href="http://github.com/snipe/snipe-it/commit/7a5b133c5875959c5d7bebf16ea82bac7ceb3989">view</a> &bull; Fixed bug linking to assets when they should be pointing to licenses
-* <a href="http://github.com/snipe/snipe-it/commit/e13578d97d6b1ef1990f171beda9b35868fda47c">view</a> &bull; Fixed error when no category is given
-* <a href="http://github.com/snipe/snipe-it/commit/45c04b1cdebc0b19243a519d2580af921c82b47b">view</a> &bull; Fixed display bug
-* <a href="http://github.com/snipe/snipe-it/commit/4d1dd1c446f76e5530d6fb7f932a77a8da2d0b73">view</a> &bull; Fixed #50 - MOAR VALIDATION!
-* <a href="http://github.com/snipe/snipe-it/commit/12958553022d4b7b2184ebf837d4113b23f5cf27">view</a> &bull; Fixes #51
-* <a href="http://github.com/snipe/snipe-it/commit/d0cbb9f3a7e4a1fc05ddcabd19e201434c14370b">view</a> &bull; Fixes #52
-* <a href="http://github.com/snipe/snipe-it/commit/5bf38b1d02e743af22a51393f1e477100b1f76b7">view</a> &bull; Fixes #50
-* <a href="http://github.com/snipe/snipe-it/commit/e6fc1956fc93132d04bf5ac4c0d108c1ae9eee0b">view</a> &bull; Fixes #55
-* <a href="http://github.com/snipe/snipe-it/commit/ee3fb2785e719c938b6036f6ea74527c1217aba8">view</a> &bull; Fixed XSS on modal
-* <a href="http://github.com/snipe/snipe-it/commit/dc5ad876863a1e17babce06adfb365f38c30ca59">view</a> &bull; Fixes #59
-* <a href="http://github.com/snipe/snipe-it/commit/d7a8cac1dc6158983673688c2e48e9a48217b6f2">view</a> &bull; Fixed validation
-* <a href="http://github.com/snipe/snipe-it/commit/196710dac807d48f6c73b02c2444a5b8d301b8a6">view</a> &bull; Fixed bug in error validation display
-* <a href="http://github.com/snipe/snipe-it/commit/1527b88fd671a20c879c9b2061ae95f3b386ba27">view</a> &bull; Fixes #61
-* <a href="http://github.com/snipe/snipe-it/commit/4c0af1eae1031c2630f6e29cc73f8a9dfac1081c">view</a> &bull; Fixed typo causing failure with mysql strict
-* <a href="http://github.com/snipe/snipe-it/commit/0e3bcfecd05a39bfea6fc7ba11cb24d9d49e6d86">view</a> &bull; Should be final fixes for mysql strict mode
-* <a href="http://github.com/snipe/snipe-it/commit/b1aa67ddb72158513f0a706996c8c1f5b3609aa5">view</a> &bull; Fixes #69
-* <a href="http://github.com/snipe/snipe-it/commit/aa38d83ba6369215451d905e599492214e9f4b8b">view</a> &bull; Fixes #63 and #70
-* <a href="http://github.com/snipe/snipe-it/commit/65cd28aad3903e11879e01faba382454dec7e75c">view</a> &bull; Fixes #14
-* <a href="http://github.com/snipe/snipe-it/commit/6552401fd869fd285aef5e217438f4f055b53ab6">view</a> &bull; Fixes #77
-* <a href="http://github.com/snipe/snipe-it/commit/012a889444fa25b174a5fb2c67e89c8c5fcf09aa">view</a> &bull; Corrected license seat count associated with license. Fixes #75
-* <a href="http://github.com/snipe/snipe-it/commit/9e189aa309750c221c27352f35e2ca1f5fab9173">view</a> &bull; Fixes #80, also prevents the user from checking out an asset that is undeployable, etc
-* <a href="http://github.com/snipe/snipe-it/commit/8680d98bc36bffa08f87020300b315d26be09928">view</a> &bull; Fixed status display bug
-* <a href="http://github.com/snipe/snipe-it/commit/4fcdf72ab6505625f244a6e6ee8683204fb81ccd">view</a> &bull; Responsive design bug fixes, placeholder code for #64 (commented out)
-* <a href="http://github.com/snipe/snipe-it/commit/d9a37f38228d55bb6265efc626e3ab7919013362">view</a> &bull; Fixes #88
-* <a href="http://github.com/snipe/snipe-it/commit/5858bfb99b2144fbc805ec62cc90e6aaaf019f77">view</a> &bull; Fixed language file paths caused by #88
-* <a href="http://github.com/snipe/snipe-it/commit/9f7cbc8a4f01ddf2596e831f658c9a8c321b2f46">view</a> &bull; Another fix related to #88, also accounts for users with invalid location_ids
-* <a href="http://github.com/snipe/snipe-it/commit/1b56c31a22afd39a875677714b9c07e96876b8df">view</a> &bull; Fixed relationship between users/locations because fuck you ORM
-* <a href="http://github.com/snipe/snipe-it/commit/f0f07b578b2439a627e5e946df0849d88d8526cf">view</a> &bull; Fixing pivot for users
-* <a href="http://github.com/snipe/snipe-it/commit/9fa826b2e77ce22d25a8b3094bc825802d25be85">view</a> &bull; Fixed assigned to id
-* <a href="http://github.com/snipe/snipe-it/commit/839d01a3af08d780be4152bc02b33bff1a7d7f20">view</a> &bull; Fixed relationship method because fuck you ORM
-* <a href="http://github.com/snipe/snipe-it/commit/06cbd0723e415d81ea12aa48f2c37188741b2dbc">view</a> &bull; Fixes #93
-* <a href="http://github.com/snipe/snipe-it/commit/e305099b45401c871f16fec23c200080830fcd5d">view</a> &bull; Fixed model view
-* <a href="http://github.com/snipe/snipe-it/commit/7003eff42ca0e0ea2b9070187c0afd8ba1a8d8b0">view</a> &bull; More fixes for #88
-* <a href="http://github.com/snipe/snipe-it/commit/567f395afaa19335671f366ce889630426f33273">view</a> &bull; More fixes for #88
-* <a href="http://github.com/snipe/snipe-it/commit/02f1977d301cd449aa806e02e8a829516d436ef7">view</a> &bull; Fixed error message
-* <a href="http://github.com/snipe/snipe-it/commit/11c657ffa4c3bdd01cd04b81d01980b2d795107c">view</a> &bull; Fixes #36
-* <a href="http://github.com/snipe/snipe-it/commit/d91d75abe4df19dd6cd54705ba9967295973ced0">view</a> &bull; Fixing JSON parse errors from #97
-* <a href="http://github.com/snipe/snipe-it/commit/baab758377e117a86c3273dd1d6e03e66b02dc8b">view</a> &bull; Fixed language support
-* <a href="http://github.com/snipe/snipe-it/commit/a678ec41714f5d7f77418b5933bc112aa67eae9c">view</a> &bull; Fixed Gravatar Hash
-* <a href="http://github.com/snipe/snipe-it/commit/c08d672e4923b12972eae76d0699e6a301f911cd">view</a> &bull; Fixes mail config documentation
-* <a href="http://github.com/snipe/snipe-it/commit/fba853a6a7a2f8166265cac2e99a526fd9b88c7b">view</a> &bull; Fixes composer formatting issues
-* <a href="http://github.com/snipe/snipe-it/commit/c11510fdcac2b2de09ae9e241c846426bdf0b187">view</a> &bull; Removes sorting from actions column.  Fixes #56
-* <a href="http://github.com/snipe/snipe-it/commit/ae05f2701559a841cb8d9bc8767e6d7a56dcd93c">view</a> &bull; Fixed depreciation bug
-* <a href="http://github.com/snipe/snipe-it/commit/d591c1ea0495de091eb0f71daa8572929096c897">view</a> &bull; Fixed bug where RTD = 1 instead of 0
-* <a href="http://github.com/snipe/snipe-it/commit/e49420f62d26405b2fa0385f0ae7b3009b3beeaf">view</a> &bull; Fixed bug in depreciation display
-* <a href="http://github.com/snipe/snipe-it/commit/1dc7fd1bdf8852fed6d886938f632c8ea69d4798">view</a> &bull; Fixed depreciation display on asset view
-* <a href="http://github.com/snipe/snipe-it/commit/211a527ae176df667f6f8fbc95901c53a368d8e2">view</a> &bull; Fixed FK
-* <a href="http://github.com/snipe/snipe-it/commit/aaebaa8d36158aafc61988a6370239e85f2e75e5">view</a> &bull; Bugfix to put custom title in the page title
-* <a href="http://github.com/snipe/snipe-it/commit/194150bbf0493512018390d011e8d88d144e9763">view</a> &bull; Hacky shit to fix pagination weirdness - will come back to this
-* <a href="http://github.com/snipe/snipe-it/commit/5fb649b59e76aa9db6e433ad8c9fc75b4b8d5fc2">view</a> &bull; Fixed error message layout
-* <a href="http://github.com/snipe/snipe-it/commit/7bc9a53b133895206a3df230baca50d3879abbe5">view</a> &bull; Fixed error when user is invalid
-* <a href="http://github.com/snipe/snipe-it/commit/82de635a75aba376209b741ce1ed4497b91e65e0">view</a> &bull; Fixed invalid seed data
-* <a href="http://github.com/snipe/snipe-it/commit/b697c77cd85416ca502ec3bb28c990099c7faae3">view</a> &bull; Fixing error when no depreciation
-* <a href="http://github.com/snipe/snipe-it/commit/432f44118f46381bdaa44daf61dfa35677aba0ee">view</a> &bull; Fixed FK in licenses model
-* <a href="http://github.com/snipe/snipe-it/commit/4468cbd096e9990300240205baf7139eafbc423c">view</a> &bull; Fixes #112
-* <a href="http://github.com/snipe/snipe-it/commit/cd62be0de03da071f344c8f66730cbc9e1475fb7">view</a> &bull; Minor div fix
-* <a href="http://github.com/snipe/snipe-it/commit/9c369d72e1e7e29f3c205586c916b2f42b250047">view</a> &bull; Fixed typo
-* <a href="http://github.com/snipe/snipe-it/commit/60d94eea04d1ebb93704e6a0d20621ff18708272">view</a> &bull; Changes serial to text area, allow new lines. Fixes #118
-* <a href="http://github.com/snipe/snipe-it/commit/580590b4c0b4a2f76ef8edfe02de986267fc7395">view</a> &bull; Fixed  === to  == (PHP is loosely typed)
@@ -1,15 +1,74 @@
-# Contributor Code of Conduct
+# Contributor Covenant Code of Conduct

-As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+## Our Pledge

-We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.

-Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+## Our Standards

-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+Examples of behavior that contributes to creating a positive environment
+include:

-This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members

-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+Examples of unacceptable behavior by participants include:

-This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.1.0, available at [http://contributor-covenant.org/version/1/1/0/](http://contributor-covenant.org/version/1/1/0/)
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [INSERT EMAIL ADDRESS]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
@@ -1,31 +1,6 @@
-# Contribution Guidelines
+### Contributing

-**Before opening an issue to report a bug or request help, make sure you've checked the [Common Issues](http://snipeitapp.com/documentation/common-issues/) and [Getting Help](http://snipeitapp.com/documentation/getting-help/) pages.**
+Please see the documentation on [contributing and developing for Snipe-IT](https://snipe-it.readme.io/docs/contributing).

-## Developing on Snipe-IT
-
-Please submit all pull requests to the [snipe/snipe-it](http://github.com/snipe/snipe-it) repository in the `develop` branch!
-
-**As you're working on bug-fixes or features, please break them out into their own feature branches and open the pull request against your feature branch**. It makes it _much_ easier to decipher down the road, as you open multiple pull requests over time, and makes it much easier for me to approve pull requests quickly.
-
-If you don't have a feature in mind, but would like to contribute back to the project, check out the [open issues](https://github.com/snipe/snipe-it/issues?state=open) and see if there are any you can tackle.
-
-We use Waffle.io to help better communicate our roadmap with users. Our [project page there](http://waffle.io/snipe/snipe-it) will show you the backlog, what's ready to be worked on, what's in progress, and what's completed.
-
-[![Stories in Ready](https://badge.waffle.io/snipe/snipe-it.png?label=ready&title=Ready)](http://waffle.io/snipe/snipe-it)
-
-The labels we use in GitHub Issues and Waffle.io indicate whether we've confirmed an issue as a bug, whether we're considering the issue as a potential feature, and whether it's ready for someone to work on it. We also provide labels such as "n00b", "intermediate" and "advanced" for the experience level we think it requires for contributors who want to help.
-
-----
-
-## Translations!
-
-If you're not a coder but want to give back to the project and you're fluent in other languages, that's okay too. We use [CrowdIn](https://crowdin.com) to manage translations, and it makes it super-simple for you to add translations (or validate proposed translations) to the project without messing with code. __Check out [the Snipe-IT CrowdIn translation project here](https://crowdin.com/project/snipe-it/)__.
-
-Thanks!
-
-----
-
-## Contributor Code of Conduct

 Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
@@ -1,76 +1,80 @@
-FROM ubuntu
+FROM ubuntu:xenial
 MAINTAINER Brady Wetherington <uberbrady@gmail.com>

 RUN apt-get update && apt-get install -y \
+apache2 \
 apache2-bin \
-libapache2-mod-php5 \
-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 
+git \
+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

 COPY docker/000-default.conf /etc/apache2/sites-enabled/000-default.conf

+#SSL
+RUN mkdir -p /var/lib/snipeit/ssl
+COPY docker/001-default-ssl.conf /etc/apache2/sites-enabled/001-default-ssl.conf
+#COPY docker/001-default-ssl.conf /etc/apache2/sites-available/001-default-ssl.conf
+
+RUN a2enmod ssl
+#RUN a2ensite 001-default-ssl.conf
+
 COPY . /var/www/html

 RUN a2enmod rewrite

 ############ INITIAL APPLICATION SETUP #####################

-COPY docker/app_start.patch /tmp/app_start.patch
-
 WORKDIR /var/www/html

-#Patch bootstrap file
-RUN patch -p1 < /tmp/app_start.patch
+#Append to bootstrap file (less brittle than 'patch')
+# RUN sed -i 's/return $app;/$env="production";\nreturn $app;/' bootstrap/start.php

-#DB create?
-# mysqladmin -u root  create snipeit_laravel
-
-#DB create user, grant access to new DB?
-# grant all privileges on snipeit_laravel.* TO snipeit;
-
-#DB config file init? (NEVER overwrite!)
-#RUN cp -n /var/www/html/app/config/production/database.example.php /var/www/html/app/config/production/database.php
-COPY docker/database.php /var/www/html/app/config/production/database.php
-
-COPY docker/mail.php /var/www/html/app/config/production/mail.php
-
-#change DB file user
-#RUN sed -i s/travis/snipe_it/ /var/www/html/app/config/production/database.php
-
-#init app config file (DO NOT overwrite!)
-RUN cp -n /var/www/html/app/config/production/app.example.php /var/www/html/app/config/production/app.php
-
-# Change default hostname to blank...I guess?
-RUN sed -i s%http://staging.yourserver.com%% /var/www/html/app/config/production/app.php
-
-# turn off the toolbar
-RUN sed -i 's%\x27debug\x27 => true%\x27debug\x27 => false%' /var/www/html/app/config/production/app.php
+#copy all configuration files
+# COPY docker/*.php /var/www/html/app/config/production/
+COPY docker/docker.env /var/www/html/.env

 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" \
+      && 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"
+
 ############## DEPENDENCIES via COMPOSER ###################

 #global install of composer
 RUN cd /tmp;curl -sS https://getcomposer.org/installer | php;mv /tmp/composer.phar /usr/local/bin/composer

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

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

@@ -81,8 +85,22 @@ RUN cd /var/www/html;composer install
 #RUN chmod +x /tmp/app_install.exp
 #RUN /tmp/app_install.exp

+############### DATA VOLUME #################
+
+VOLUME ["/var/lib/snipeit"]
+
 ##### START SERVER

-CMD . /etc/apache2/envvars ;apache2 -DFOREGROUND
+COPY docker/entrypoint.sh /entrypoint.sh
+RUN chmod +x /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
@@ -1,44 +1,41 @@
-[![Click here to lend your support to: Snipe IT - Free Open Source Asset Management System and make a donation at pledgie.com](https://pledgie.com/campaigns/22899.png?skin_name=chrome)](https://pledgie.com/campaigns/22899) [![Build Status](https://travis-ci.org/snipe/snipe-it.svg?branch=develop)](https://travis-ci.org/snipe/snipe-it) [![Stories in Ready](https://badge.waffle.io/snipe/snipe-it.png?label=ready&title=Ready)](http://waffle.io/snipe/snipe-it) [![ProjectStatus](http://stillmaintained.com/snipe/snipe-it.png)](http://stillmaintained.com/snipe/snipe-it) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.png)](https://crowdin.com/project/snipe-it)
+[![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-80-orange.svg?style=flat-square)](#contributors)


-## Snipe-IT - Asset Management For the Rest of Us
-
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/snipe/snipe-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+## 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 4.2](http://laravel.com) and uses the [Sentry 2](https://github.com/cartalyst/sentry) package.
+It is built on [Laravel 5.4](http://laravel.com).

-This project is being actively developed and we're [releasing quite frequently](https://github.com/snipe/snipe-it/releases). ([Check out the live demo here](http://snipeitapp.com/demo/).)
+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/).)

-__This is web-based software__. This means there there is no executable file (aka no .exe files), and it must be run on a web server and accessed through a web browser. It runs on any Mac OSX, flavor of Linux, as well as Windows.
+__This is web-based software__. This means there there is no executable file (aka no .exe files), and it must be run on a web server and accessed through a web browser. It runs on any Mac OSX, flavor of Linux, as well as Windows, and we have a [Docker image](https://snipe-it.readme.io/docs/docker) available if that's what you're into.

 -----

 ### Installation

-__Installation and configuration documentation for this project has been moved to http://docs.snipeitapp.com.__
+For instructions on installing and configuring Snipe-IT on your server, check out the [installation manual](https://snipe-it.readme.io/docs). (Please see the [requirements documentation](https://snipe-it.readme.io/docs/requirements) for full requirements.)

-#### Server Requirements
-Please see the [requirements documentation](http://docs.snipeitapp.com/requirements.html) for full requirements.
+If you're having trouble with the installation, please check the [Common Issues](https://snipe-it.readme.io/docs/common-issues) and [Getting Help](https://snipe-it.readme.io/docs/getting-help) documentation, and search this repository's open *and* closed issues for help.

-
-To deploy on Ubuntu using Ansible and Vagrant, check out the [Snipe-IT Installation scripts](https://github.com/GR360RY/snipeit-ansible) created by [@GR360RY](https://github.com/GR360RY/).
+-----
+### User's Manual
+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.

-We use Waffle.io to help better communicate our roadmap with users. Our [project page there](http://waffle.io/snipe/snipe-it) will show you the backlog, what's ready to be worked on, what's in progress, and what's completed.
-
-If you're having trouble with the installation, please check the [Common Issues](http://docs.snipeitapp.com/common-issues.html) and [Getting Help](http://docs.snipeitapp.com/getting-help.html) documentation.
+**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.**

 -----

 ### Upgrading

-Please see the [upgrading documentation](http://docs.snipeitapp.com/upgrading.html) for instructions on upgrading Snipe-IT.
+Please see the [upgrading documentation](https://snipe-it.readme.io/docs/upgrading) for instructions on upgrading Snipe-IT.

 ------
 ### Announcement List
@@ -49,14 +46,43 @@ To be notified of important news (such as new releases, security advisories, etc

 ### Translations!

-Please see the [translations documentation](http://docs.snipeitapp.com/translations.html) for information about available languages and how to add translations to Snipe-IT.
+Please see the [translations documentation](https://snipe-it.readme.io/docs/translations) for information about available languages and how to add translations to Snipe-IT.
+
+-----
+
+### 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") | [<img src="https://avatars0.githubusercontent.com/u/6961695?v=4" width="110px;"/><br /><sub>Iman</sub>](https://github.com/imanghafoori1)<br />[💻](https://github.com/snipe/snipe-it/commits?author=imanghafoori1 "Code") | [<img src="https://avatars1.githubusercontent.com/u/6551003?v=4" width="110px;"/><br /><sub>Richard Hofman</sub>](https://github.com/richardhofman6)<br />[💻](https://github.com/snipe/snipe-it/commits?author=richardhofman6 "Code") |
+<!-- 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](http://docs.snipeitapp.com/contributing.html).
+Please see the documentation on [contributing and developing for Snipe-IT](https://snipe-it.readme.io/docs/contributing).

-[![Stories in Ready](https://badge.waffle.io/snipe/snipe-it.png?label=ready+for+dev&title=Ready+for+Development)](http://waffle.io/snipe/snipe-it)

 Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
+
+-----
+
+### Security
+
+To report a security vulnerability, please email security@snipeitapp.com instead of using the issue tracker. 
@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class CreateAdmin extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'snipeit:create-admin {--first_name=} {--last_name=}  {--email=}  {--username=}  {--password=}   {show_in_list?}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Create an admin user via command line.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+
+        $first_name = $this->option('first_name');
+        $last_name = $this->option('last_name');
+        $username = $this->option('username');
+        $email = $this->option('email');
+        $password = $this->option('password');
+        $show_in_list = $this->argument('show_in_list');
+
+        if (($first_name=='') || ($last_name=='') || ($username=='') || ($email=='') || ($password=='')) {
+            $this->info('ERROR: All fields are required.');
+        } else {
+            $user = new \App\Models\User;
+            $user->first_name = $first_name;
+            $user->last_name = $last_name;
+            $user->username = $username;
+            $user->email = $email;
+            $user->permissions = '{"admin":1,"user":1,"superuser":1,"reports.view":1, "licenses.keys":1}';
+            $user->password = bcrypt($password);
+            $user->activated = 1;
+
+            if ($show_in_list == 'false') {
+                $user->show_in_list = 0;
+            }
+            if ($user->save()) {
+                $this->info('New user created');
+                $user->groups()->attach(1);
+            } else {
+                $this->info('Admin user was not created');
+                $errors = $user->getErrors();
+
+                foreach ($errors->all() as $error) {
+                    $this->info('ERROR:'. $error);
+                }
+
+            }
+        }
+
+    }
+
+  //   protected function getArguments()
+  // 	{
+  // 		return array(
+  // 			array('username', InputArgument::REQUIRED, 'Username'),
+  // 		);
+    // }
+}
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use App\Models\Setting;
+
+class DisableLDAP extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'snipeit:ldap-disable';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This is  a rescue command that can be used to turn off LDAP settings in the event that you managed to lock yourself out using bad LDAP settings.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+
+        if ($this->confirm("\n****************************************************\nThis will disable LDAP support. You will not be able \nto login with an account that does not exist \nlocally in the Snipe-IT local database. \n****************************************************\n\nDo you wish to continue? [y|N]")) {
+
+            $setting = Setting::first();
+            $setting->ldap_enabled = 0;
+            if ($setting->save()) {
+                $this->info('LDAP has been set to disabled.');
+            } else {
+                $this->info('Unable to disable LDAP.');
+            }
+        } else {
+            $this->info('Canceled. No actions taken.');
+        }
+
+    }
+}
@@ -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');
+
+    }
+}
@@ -0,0 +1,200 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use App\Models\Setting;
+use App\Models\Ldap;
+use App\Models\User;
+use App\Models\Location;
+use Log;
+
+class LdapSync extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'snipeit:ldap-sync {--location=} {--location_id=} {--summary}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Command line LDAP sync';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        ini_set('max_execution_time', 600); //600 seconds = 10 minutes
+        ini_set('memory_limit', '500M');
+
+        $ldap_result_username = Setting::getSettings()->ldap_username_field;
+        $ldap_result_last_name = Setting::getSettings()->ldap_lname_field;
+        $ldap_result_first_name = Setting::getSettings()->ldap_fname_field;
+
+        $ldap_result_active_flag = Setting::getSettings()->ldap_active_flag_field;
+        $ldap_result_emp_num = Setting::getSettings()->ldap_emp_num;
+        $ldap_result_email = Setting::getSettings()->ldap_email;
+
+        try {
+            $ldapconn = Ldap::connectToLdap();
+        } catch (\Exception $e) {
+            LOG::error($e);
+        }
+
+        try {
+            Ldap::bindAdminToLdap($ldapconn);
+        } catch (\Exception $e) {
+            LOG::error($e);
+        }
+
+        $summary = array();
+
+        $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();
+            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();
+            LOG::debug('Location ID '.$this->option('location_id').' passed');
+            LOG::debug('Importing to '.$location->name.' ('.$location->id.')');
+        } else {
+	    $location = NULL;
+	}
+
+        if (!isset($location)) {
+            LOG::debug('That location is invalid or a location was not provided, so no location will be assigned by default.');
+        }
+
+        // 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);
+
+
+        for ($i = 0; $i < $results["count"]; $i++) {
+            if (empty($ldap_result_active_flag) || $results[$i][$ldap_result_active_flag][0] == "TRUE") {
+
+                $item = array();
+                $item["username"] = isset($results[$i][$ldap_result_username][0]) ? $results[$i][$ldap_result_username][0] : "";
+                $item["employee_number"] = isset($results[$i][$ldap_result_emp_num][0]) ? $results[$i][$ldap_result_emp_num][0] : "";
+                $item["lastname"] = isset($results[$i][$ldap_result_last_name][0]) ? $results[$i][$ldap_result_last_name][0] : "";
+                $item["firstname"] = isset($results[$i][$ldap_result_first_name][0]) ? $results[$i][$ldap_result_first_name][0] : "";
+                $item["email"] = isset($results[$i][$ldap_result_email][0]) ? $results[$i][$ldap_result_email][0] : "" ;
+                $item["ldap_location_override"] = isset($results[$i]["ldap_location_override"]) ? $results[$i]["ldap_location_override"]:"";
+                $item["location_id"] = isset($results[$i]["location_id"]) ? $results[$i]["location_id"]:"";
+
+
+                // User exists
+                $item["createorupdate"] = 'updated';
+                if (!$user = User::where('username', $item["username"])->first()) {
+                    $user = new User;
+                    $user->password = $pass;
+                    $item["createorupdate"] = 'created';
+                }
+
+                // Create the user if they don't exist.
+
+
+                $user->first_name = e($item["firstname"]);
+                $user->last_name = e($item["lastname"]);
+                $user->username = e($item["username"]);
+                $user->email = e($item["email"]);
+                $user->employee_num = e($item["employee_number"]);
+                $user->activated = 1;
+
+                if ($item['ldap_location_override'] == true) {
+                    $user->location_id = $item['location_id'];
+                } else if ($location) {
+                    $user->location_id = e($location->id);
+                }
+
+                $user->notes = 'Imported from LDAP';
+                $user->ldap_import = 1;
+
+                $errors = '';
+
+                if ($user->save()) {
+                    $item["note"] = $item["createorupdate"];
+                    $item["status"]='success';
+                } else {
+                    foreach ($user->getErrors()->getMessages() as $key => $err) {
+                        $errors .= $err[0];
+                    }
+                    $item["note"] = $errors;
+                    $item["status"]='error';
+                }
+
+                array_push($summary, $item);
+            }
+
+        }
+
+        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']);
+                } else {
+                    $this->info('User '.$summary[$x]['firstname'].' '.$summary[$x]['lastname'].' (username:  '.$summary[$x]['username'].' was '.strtoupper($summary[$x]['createorupdate']).'.');
+                }
+
+            }
+        } else {
+            return $summary;
+        }
+
+
+
+    }
+}
@@ -0,0 +1,183 @@
+<?php
+namespace App\Console\Commands;
+
+use App\Helpers\Helper;
+use App\Importer\AccessoryImporter;
+use App\Importer\AssetImporter;
+use App\Importer\ConsumableImporter;
+use App\Importer\Importer;
+use App\Models\Accessory;
+use App\Models\Asset;
+use App\Models\AssetModel;
+use App\Models\Category;
+use App\Models\Company;
+use App\Models\Consumable;
+use App\Models\CustomField;
+use App\Models\Location;
+use App\Models\Manufacturer;
+use App\Models\Setting;
+use App\Models\Statuslabel;
+use App\Models\Supplier;
+use App\Models\User;
+use DB;
+use Illuminate\Console\Command;
+use Illuminate\Database\Eloquent\Model;
+use League\Csv\Reader;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputOption;
+use ForceUTF8\Encoding;
+
+ini_set('max_execution_time', 600); //600 seconds = 10 minutes
+ini_set('memory_limit', '500M');
+
+/**
+ * Class ObjectImportCommand
+ */
+class ObjectImportCommand extends Command
+{
+
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $name = 'snipeit:import';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Import Items from CSV';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+    private $bar;
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function fire()
+    {
+        $filename = $this->argument('filename');
+        $class = title_case($this->option('item-type'));
+        $classString = "App\\Importer\\{$class}Importer";
+        $importer = new $classString($filename);
+        $importer->setCallbacks([$this, 'log'], [$this, 'progress'], [$this, 'errorCallback'])
+                 ->setUserId($this->option('user_id'))
+                 ->setUpdating($this->option('update'))
+                 ->setUsernameFormat($this->option('username_format'));
+
+        $logFile = $this->option('logfile');
+        \Log::useFiles($logFile);
+        if ($this->option('testrun')) {
+            $this->comment('====== TEST ONLY Item Import for '.$filename.' ====');
+            $this->comment('============== NO DATA WILL BE WRITTEN ==============');
+        } else {
+            $this->comment('======= Importing Items from '.$filename.' =========');
+        }
+        $importer->import();
+
+        $this->bar = null;
+
+        if (!empty($this->errors)) {
+            $this->comment("The following Errors were encountered.");
+            foreach ($this->errors as $asset => $error) {
+                $this->comment('Error: Item: ' . $asset . ' failed validation: ' . json_encode($error));
+            }
+        } else {
+            $this->comment("All Items imported successfully!");
+        }
+        $this->comment("");
+
+        return;
+    }
+
+    public function errorCallback($item, $field, $errorString)
+    {
+        $this->errors[$item->name][$field] = $errorString;
+    }
+    public function progress($count)
+    {
+        if (!$this->bar) {
+            $this->bar = $this->output->createProgressBar($count);
+        }
+        static $index =0;
+        $index++;
+        if ($index < $count) {
+            $this->bar->advance();
+        } else {
+            $this->bar->finish();
+        }
+    }
+    // Tracks the current item for error messages
+    private $updating;
+    // An array of errors encountered while parsing
+    private $errors;
+
+
+    /**
+     * Log a message to file, configurable by the --log-file parameter.
+     * If a warning message is passed, we'll spit it to the console as well.
+     *
+     * @author Daniel Melzter
+     * @since 3.0
+     * @param string $string
+     * @param string $level
+    */
+    public function log($string, $level = 'info')
+    {
+        if ($level === 'warning') {
+            \Log::warning($string);
+            $this->comment($string);
+        } else {
+            \Log::Info($string);
+            if ($this->option('verbose')) {
+                $this->comment($string);
+            }
+        }
+    }
+    /**
+     * Get the console command arguments.
+     *
+     * @author Daniel Melzter
+     * @since 3.0
+     * @return array
+     */
+    protected function getArguments()
+    {
+        return array(
+            array('filename', InputArgument::REQUIRED, 'File for the CSV import.'),
+        );
+    }
+
+
+    /**
+     * Get the console command options.
+     *
+     * @author Daniel Melzter
+     * @since 3.0
+     * @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('logfile', null, InputOption::VALUE_REQUIRED, 'The path to log output to.  storage/logs/importer.log by default', storage_path('logs/importer.log') ),
+        array('item-type', null, InputOption::VALUE_REQUIRED, 'Item Type To import.  Valid Options are Asset, Consumable, Accessory, License, or User', 'Asset'),
+        array('web-importer', null, InputOption::VALUE_NONE, 'Internal: packages output for use with the web importer'),
+        array('user_id', null, InputOption::VALUE_REQUIRED, 'ID of user creating items', 1),
+        array('update', null, InputOption::VALUE_NONE, 'If a matching item is found, update item information'),
+        );
+
+    }
+}
@@ -0,0 +1,142 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Accessory;
+use App\Models\Asset;
+use App\Models\AssetModel;
+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
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'snipeit:pave
+              {--soft : Perform a "Soft" Delete, leaving all migrations, table structure, and the first user in place.}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Pave the database to start over. This should ALMOST NEVER BE USED. (It is primarily a quick tool for developers.)';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        if ($this->confirm("\n****************************************************\nTHIS WILL DELETE ALL OF THE DATA IN YOUR DATABASE. \nThere is NO undo. This WILL destroy ALL of your data. \n****************************************************\n\nDo you wish to continue? No backsies! [y|N]")) {
+            if ($this->option('soft')) {
+                Accessory::getQuery()->delete();
+                Asset::getQuery()->delete();
+                Category::getQuery()->delete();
+                Company::getQuery()->delete();
+                Component::getQuery()->delete();
+                Consumable::getQuery()->delete();
+                Department::getQuery()->delete();
+                Depreciation::getQuery()->delete();
+                License::getQuery()->delete();
+                LicenseSeat::getQuery()->delete();
+                Location::getQuery()->delete();
+                Manufacturer::getQuery()->delete();
+                AssetModel::getQuery()->delete();
+                Statuslabel::getQuery()->delete();
+                Supplier::getQuery()->delete();
+                Group::getQuery()->delete();
+                Import::getQuery()->delete();
+
+                DB::statement('delete from accessories_users');
+                DB::statement('delete from asset_logs');
+                DB::statement('delete from asset_maintenances');
+                DB::statement('delete from asset_uploads');
+                DB::statement('delete from action_logs');
+                DB::statement('delete from checkout_requests');
+                DB::statement('delete from consumables_users');
+                DB::statement('delete from custom_field_custom_fieldset');
+                DB::statement('delete from custom_fields');
+                DB::statement('delete from custom_fieldsets');
+                DB::statement('delete from components_assets');
+                DB::statement('delete from password_resets');
+                DB::statement('delete from requested_assets');
+                DB::statement('delete from requests');
+                DB::statement('delete from throttle');
+                DB::statement('delete from users_groups');
+                DB::statement('delete from users WHERE id!=1');
+            } else {
+                \DB::statement('drop table IF EXISTS accessories_users');
+                \DB::statement('drop table IF EXISTS accessories');
+                \DB::statement('drop table IF EXISTS asset_logs');
+                \DB::statement('drop table IF EXISTS action_logs');
+                \DB::statement('drop table IF EXISTS asset_maintenances');
+                \DB::statement('drop table IF EXISTS asset_uploads');
+                \DB::statement('drop table IF EXISTS assets');
+                \DB::statement('drop table IF EXISTS categories');
+                \DB::statement('drop table IF EXISTS checkout_requests');
+                \DB::statement('drop table IF EXISTS companies');
+                \DB::statement('drop table IF EXISTS consumables_users');
+                \DB::statement('drop table IF EXISTS consumables');
+                \DB::statement('drop table IF EXISTS custom_field_custom_fieldset');
+                \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');
+                \DB::statement('drop table IF EXISTS components_assets');
+                \DB::statement('drop table IF EXISTS license_seats');
+                \DB::statement('drop table IF EXISTS licenses');
+                \DB::statement('drop table IF EXISTS locations');
+                \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');
+                \DB::statement('drop table IF EXISTS settings');
+                \DB::statement('drop table IF EXISTS status_labels');
+                \DB::statement('drop table IF EXISTS suppliers');
+                \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');
+            }
+        }
+    }
+}
@@ -0,0 +1,178 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use DB;
+use \App\Models\Asset;
+use \App\Models\AssetModel;
+use \App\Models\Location;
+use \App\Models\Company;
+use \App\Models\License;
+use \App\Models\Accessory;
+use \App\Models\Component;
+use \App\Models\Consumable;
+use \App\Models\Category;
+use \App\Models\User;
+use \App\Models\Supplier;
+use \App\Models\Manufacturer;
+use \App\Models\Depreciation;
+use \App\Models\Statuslabel;
+
+class Purge extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'snipeit:purge {--force=false}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Purge all soft-deleted deleted records in the database. This will rewrite history for items that have been edited, or checked in or out. It will also reqrite history for users associated with deleted items.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $force = $this->option('force');
+        if (($this->confirm("\n****************************************************\nTHIS WILL PURGE ALL SOFT-DELETED ITEMS IN YOUR SYSTEM. \nThere is NO undo. This WILL permanently destroy \nALL of your deleted data. \n****************************************************\n\nDo you wish to continue? No backsies! [y|N]")) ||  $force == 'true') {
+
+            /**
+             * Delete assets
+             */
+            $assets = Asset::whereNotNull('deleted_at')->withTrashed()->get();
+            $assetcount = $assets->count();
+            $this->info($assets->count().' assets purged.');
+            $asset_assoc = 0;
+            $asset_maintenances = 0;
+
+            foreach ($assets as $asset) {
+                $this->info('- Asset "'.$asset->present()->name().'" deleted.');
+                $asset_assoc += $asset->assetlog()->count();
+                $asset->assetlog()->forceDelete();
+                $asset_maintenances += $asset->assetmaintenances()->count();
+                $asset->assetmaintenances()->forceDelete();
+                $asset->forceDelete();
+            }
+
+            $this->info($asset_assoc.' corresponding log records purged.');
+            $this->info($asset_maintenances.' corresponding maintenance records purged.');
+
+            $locations = Location::whereNotNull('deleted_at')->withTrashed()->get();
+            $this->info($locations->count().' locations purged.');
+            foreach ($locations as $location) {
+                $this->info('- Location "'.$location->name.'" deleted.');
+                $location->forceDelete();
+            }
+
+
+            $accessories = Accessory::whereNotNull('deleted_at')->withTrashed()->get();
+            $accessory_assoc=0;
+            $this->info($accessories->count().' accessories purged.');
+            foreach ($accessories as $accessory) {
+                $this->info('- Accessory "'.$accessory->name.'" deleted.');
+                $accessory_assoc += $accessory->assetlog()->count();
+                $accessory->assetlog()->forceDelete();
+                $accessory->forceDelete();
+            }
+            $this->info($accessory_assoc.' corresponding log records purged.');
+
+
+            $consumables = Consumable::whereNotNull('deleted_at')->withTrashed()->get();
+            $this->info($consumables->count().' consumables purged.');
+            foreach ($consumables as $consumable) {
+                $this->info('- Consumable "'.$consumable->name.'" deleted.');
+                $consumable->assetlog()->forceDelete();
+                $consumable->forceDelete();
+            }
+
+
+            $components = Component::whereNotNull('deleted_at')->withTrashed()->get();
+            $this->info($components->count().' components purged.');
+            foreach ($components as $component) {
+                $this->info('- Component "'.$component->name.'" deleted.');
+                $component->assetlog()->forceDelete();
+                $component->forceDelete();
+            }
+
+            $licenses = License::whereNotNull('deleted_at')->withTrashed()->get();
+            $this->info($licenses->count().' licenses purged.');
+            foreach ($licenses as $license) {
+                $this->info('- License "'.$license->name.'" deleted.');
+                $license->assetlog()->forceDelete();
+                $license->licenseseats()->forceDelete();
+                $license->forceDelete();
+            }
+
+            $models = AssetModel::whereNotNull('deleted_at')->withTrashed()->get();
+            $this->info($models->count().' asset models purged.');
+            foreach ($models as $model) {
+                $this->info('- Asset Model "'.$model->name.'" deleted.');
+                $model->forceDelete();
+            }
+
+
+            $categories = Category::whereNotNull('deleted_at')->withTrashed()->get();
+            $this->info($categories->count().' categories purged.');
+            foreach ($categories as $category) {
+                $this->info('- Category "'.$category->name.'" deleted.');
+                $category->forceDelete();
+            }
+
+            $suppliers = Supplier::whereNotNull('deleted_at')->withTrashed()->get();
+            $this->info($suppliers->count().' suppliers purged.');
+            foreach ($suppliers as $supplier) {
+                $this->info('- Supplier "'.$supplier->name.'" deleted.');
+                $supplier->forceDelete();
+            }
+
+            $users = User::whereNotNull('deleted_at')->where('show_in_list', '!=', '0')->withTrashed()->get();
+            $this->info($users->count().' users purged.');
+            $user_assoc = 0;
+            foreach ($users as $user) {
+                $this->info('- User "'.$user->username.'" deleted.');
+                $user_assoc += $user->userlog()->count();
+                $user->userlog()->forceDelete();
+                $user->forceDelete();
+            }
+            $this->info($user_assoc.' corresponding user log records purged.');
+
+            $manufacturers = Manufacturer::whereNotNull('deleted_at')->withTrashed()->get();
+            $this->info($manufacturers->count().' manufacturers purged.');
+            foreach ($manufacturers as $manufacturer) {
+                $this->info('- Manufacturer "'.$manufacturer->name.'" deleted.');
+                $manufacturer->forceDelete();
+            }
+
+            $status_labels = Statuslabel::whereNotNull('deleted_at')->withTrashed()->get();
+            $this->info($status_labels->count().' status labels purged.');
+            foreach ($status_labels as $status_label) {
+                $this->info('- Status Label "'.$status_label->name.'" deleted.');
+                $status_label->forceDelete();
+            }
+
+
+        } else {
+            $this->info('Action canceled. Nothing was purged.');
+        }
+
+    }
+}
@@ -0,0 +1,164 @@
+<?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');
+        $key_parts = explode(':', $legacy_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;
+        }
+
+
+        // Do some basic legacy app key length checks
+        if (strlen($legacy_key) == 32) {
+            $legacy_length_check = true;
+        } elseif (array_key_exists('1', $key_parts) && (strlen($key_parts[1])==44)) {
+            $legacy_length_check = true;
+        } else {
+            $legacy_length_check = false;
+        }
+   
+
+
+        // Check that the app key is 32 characters
+        if ($legacy_length_check === true) {
+            $this->comment('INFO: Your LEGACY_APP_KEY looks correct. Okay to continue.');
+        } else {
+            $this->error('ERROR: Your LEGACY_APP_KEY is not the correct length (32 characters or base64 followed by 44 characters for later versions). 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);
+                }
+            }
+        }
+
+    }
+}
@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Console\Commands;
+
+
+use App\Models\Asset;
+use Illuminate\Console\Command;
+use App\Notifications\ExpectedCheckinNotification;
+use Carbon\Carbon;
+
+class SendExpectedCheckinAlerts extends Command
+{
+
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $name = 'snipeit:expected-checkin';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Check for overdue or upcoming expected checkins.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function fire()
+    {
+
+        $whenNotify = Carbon::now()->addDays(7);
+        $assets = Asset::with('assignedTo')->whereNotNull('expected_checkin')->where('expected_checkin', '<=', $whenNotify)->get();
+
+        $this->info($whenNotify.' is deadline');
+        $this->info($assets->count().' assets');
+
+        foreach ($assets as $asset) {
+            if ($asset->assignedTo  && $asset->checkoutOutToUser()) {
+                $asset->assignedTo->notify((new ExpectedCheckinNotification($asset)));
+                //$this->info($asset);
+            }
+        }
+
+
+
+
+
+    }
+}
@@ -0,0 +1,137 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Asset;
+use App\Models\License;
+use App\Models\Setting;
+use DB;
+
+use Illuminate\Console\Command;
+
+class SendExpirationAlerts extends Command
+{
+
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $name = 'snipeit:expiring-alerts';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Check for expiring warrantees and service agreements, and sends out an alert email.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function fire()
+    {
+
+        // Expiring Assets
+        $expiring_assets = Asset::getExpiringWarrantee(Setting::getSettings()->alert_interval);
+        $this->info(count($expiring_assets).' expiring assets');
+
+        $asset_data['count'] =  count($expiring_assets);
+        $asset_data['email_content'] ='';
+        $now = date("Y-m-d");
+
+
+        foreach ($expiring_assets as $asset) {
+
+            $expires = $asset->present()->warrantee_expires();
+            $difference =  round(abs(strtotime($expires) - strtotime($now))/86400);
+
+            if ($difference > 30) {
+                $asset_data['email_content'] .= '<tr style="background-color: #fcffa3;">';
+            } else {
+                $asset_data['email_content'] .= '<tr style="background-color:#d9534f;">';
+            }
+            $asset_data['email_content'] .= '<td><a href="'.config('app.url').'/hardware/'.e($asset->id).'/view">';
+            $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->assignedTo ? e($asset->assignedTo->present()->name()) : '').'</td>';
+            $asset_data['email_content'] .= '</tr>';
+        }
+
+        // Expiring licenses
+        $expiring_licenses = License::getExpiringLicenses(Setting::getSettings()->alert_interval);
+        $this->info(count($expiring_licenses).' expiring licenses');
+
+
+        $license_data['count'] =  count($expiring_licenses);
+        $license_data['email_content'] = '';
+
+        foreach ($expiring_licenses as $license) {
+            $expires = $license->expiration_date;
+            $difference =  round(abs(strtotime($expires) - strtotime($now))/86400);
+
+            if ($difference > 30) {
+                $license_data['email_content'] .= '<tr style="background-color: #fcffa3;">';
+            } else {
+                $license_data['email_content'] .= '<tr style="background-color:#d9534f;">';
+            }
+                $license_data['email_content'] .= '<td><a href="'.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>';
+                $license_data['email_content'] .= '</tr>';
+        }
+
+        if ((Setting::getSettings()->alert_email!='')  && (Setting::getSettings()->alerts_enabled==1)) {
+
+
+            if (count($expiring_assets) > 0) {
+                $this->info('Report sent to '.Setting::getSettings()->alert_email);
+                \Mail::send('emails.expiring-assets-report', $asset_data, function ($m) {
+                    $m->to(explode(',', Setting::getSettings()->alert_email), Setting::getSettings()->site_name);
+                    $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
+                    $m->subject(trans('mail.Expiring_Assets_Report'));
+                });
+
+            }
+
+            if (count($expiring_licenses) > 0) {
+                $this->info('Report sent to '.Setting::getSettings()->alert_email);
+                \Mail::send('emails.expiring-licenses-report', $license_data, function ($m) {
+                    $m->to(explode(',', Setting::getSettings()->alert_email), Setting::getSettings()->site_name);
+                    $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
+                    $m->subject(trans('mail.Expiring_Licenses_Report'));
+                });
+
+            }
+
+
+        } else {
+
+            if (Setting::getSettings()->alert_email=='') {
+                echo "Could not send email. No alert email configured in settings. \n";
+            } elseif (Setting::getSettings()->alerts_enabled!=1) {
+                echo "Alerts are disabled in the settings. No mail will be sent. \n";
+            }
+
+        }
+
+
+
+
+    }
+}
@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Setting;
+use DB;
+use Mail;
+use App\Helpers\Helper;
+
+use Illuminate\Console\Command;
+
+class SendInventoryAlerts extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'snipeit:inventory-alerts';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This command checks for low inventory, and sends out an alert email.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        if ((Setting::getSettings()->alert_email!='')  && (Setting::getSettings()->alerts_enabled==1)) {
+
+            $data['data'] = Helper::checkLowInventory();
+            $data['count'] = count($data['data']);
+
+            if (count($data['data']) > 0) {
+                \Mail::send('emails.low-inventory', $data, function ($m) {
+                    $m->to(explode(',', Setting::getSettings()->alert_email), Setting::getSettings()->site_name);
+                    $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
+                    $m->subject(trans('mail.Low_Inventory_Report'));
+                });
+
+            }
+
+        } else {
+            if (Setting::getSettings()->alert_email=='') {
+                echo "Could not send email. No alert email configured in settings. \n";
+            } elseif (Setting::getSettings()->alerts_enabled!=1) {
+                echo "Alerts are disabled in the settings. No mail will be sent. \n";
+            }
+        }
+
+
+    }
+}
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class SystemBackup extends Command
+{
+
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $name = 'snipeit:backup';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This command creates a database dump and zips up all of the uploaded files in the upload directories.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function fire()
+    {
+        //
+        $this->call('backup:run');
+
+    }
+}
@@ -0,0 +1,91 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Symfony\Component\Console\Input\InputArgument;
+
+use Illuminate\Console\Command;
+
+class Versioning extends Command
+{
+
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $name = 'versioning:update';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Generate and update app\'s version via git.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return void
+     */
+    public function fire()
+    {
+
+        $versionFile = 'config/version.php';
+        $hash_version = str_replace("\n", '', shell_exec('git describe --tags'));
+
+        $version = explode('-', $hash_version);
+
+        $array = var_export(
+            array(
+            'app_version' => $version[0],
+            'build_version' => $version[1],
+            'hash_version' => $version[2],
+            'full_hash' => $hash_version),
+            true
+        );
+
+
+        // Construct our file content
+            $content = <<<CON
+<?php
+return $array;
+CON;
+
+        // And finally write the file and output the current version
+            \File::put($versionFile, $content);
+            $this->line('Setting version: '. config('version.app_version').' build '.config('version.build_version').' ('.config('version.hash_version').')');
+    }
+
+    /**
+     * Get the console command arguments.
+     *
+     * @return array
+     */
+    protected function getArguments()
+    {
+        return array(
+        );
+    }
+
+    /**
+     * Get the console command options.
+     *
+     * @return array
+     */
+    protected function getOptions()
+    {
+        return array(
+        );
+    }
+}
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Console;
+
+use Illuminate\Console\Scheduling\Schedule;
+use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+
+class Kernel extends ConsoleKernel
+{
+    /**
+     * The Artisan commands provided by your application.
+     *
+     * @var array
+     */
+    protected $commands = [
+        Commands\PaveIt::class,
+        Commands\CreateAdmin::class,
+        Commands\SendExpirationAlerts::class,
+        Commands\SendInventoryAlerts::class,
+        Commands\SendExpectedCheckinAlerts::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
+    ];
+
+    /**
+     * Define the application's command schedule.
+     *
+     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
+     * @return void
+     */
+    protected function schedule(Schedule $schedule)
+    {
+
+        $schedule->command('snipeit:inventory-alerts')->daily();
+        $schedule->command('snipeit:expiring-alerts')->daily();
+        $schedule->command('snipeit:expected-checkins')->daily();
+        $schedule->command('snipeit:backup')->weekly();
+        $schedule->command('backup:clean')->daily();
+    }
+
+    protected function commands()
+    {
+        require base_path('routes/console.php');
+    }
+}
@@ -0,0 +1,8 @@
+<?php
+
+namespace App\Events;
+
+abstract class Event
+{
+    //
+}
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+class CheckoutNotAllowed extends Exception
+{
+    public function __toString()
+    {
+        "A checkout is not allowed under these circumstances";
+    }
+}
@@ -0,0 +1,116 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+use Illuminate\Auth\AuthenticationException;
+use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use App\Helpers\Helper;
+use Illuminate\Validation\ValidationException;
+
+class Handler extends ExceptionHandler
+{
+    /**
+     * A list of the exception types that should not be reported.
+     *
+     * @var array
+     */
+    protected $dontReport = [
+        \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,
+    ];
+
+    /**
+     * Report or log an exception.
+     *
+     * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
+     *
+     * @param  \Exception  $exception
+     * @return void
+     */
+    public function report(Exception $exception)
+    {
+        parent::report($exception);
+    }
+
+    /**
+     * Render an exception into an HTTP response.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Exception  $e
+     * @return \Illuminate\Http\Response
+     */
+    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'));
+        }
+
+
+        // Handle Ajax requests that fail because the model doesn't exist
+        if ($request->ajax() || $request->wantsJson()) {
+
+            if ($e instanceof \Illuminate\Database\Eloquent\ModelNotFoundException) {
+                $className = last(explode('\\', $e->getModel()));
+                return response()->json(Helper::formatStandardApiResponse('error', null, $className . ' not found'), 200);
+            }
+
+            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 in a 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');
+    }
+}
@@ -0,0 +1,729 @@
+<?php
+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;
+use App\Models\Manufacturer;
+use App\Models\Supplier;
+use App\Models\Category;
+use App\Models\Depreciation;
+use App\Models\CustomFieldset;
+use App\Models\CustomField;
+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;
+
+class Helper
+{
+
+
+    /**
+     * Simple helper to invoke the markdown parser
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v2.0]
+     * @return String
+     */
+    public static function parseEscapedMarkedown($str)
+    {
+        $Parsedown = new \Parsedown();
+
+        if ($str) {
+            return $Parsedown->text(e($str));
+        }
+    }
+
+
+    /**
+     * The importer has formatted number strings since v3,
+     * so the value might be a string, or an integer.
+     * If it's a number, format it as a string.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v2.0]
+     * @return String
+     */
+    public static function formatCurrencyOutput($cost)
+    {
+        if (is_numeric($cost)) {
+            return number_format($cost, 2, '.', '');
+        }
+        // It's already been parsed.
+        return $cost;
+    }
+
+
+    /**
+     * Static colors for pie charts.
+     * This is inelegant, and could be refactored later.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.3]
+     * @return Array
+     */
+    public static function chartColors()
+    {
+        $colors = [
+            '#f56954',
+            '#00a65a',
+            '#f39c12',
+            '#00c0ef',
+            '#3c8dbc',
+            '#d2d6de',
+            '#3c8dbc',
+            '#3c8dbc',
+            '#3c8dbc',
+
+        ];
+        return $colors;
+    }
+
+
+    /**
+     * Static background (highlight) colors for pie charts
+     * This is inelegant, and could be refactored later.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.2]
+     * @return Array
+     */
+    public static function chartBackgroundColors()
+    {
+        $colors = [
+            '#f56954',
+            '#00a65a',
+            '#f39c12',
+            '#00c0ef',
+            '#3c8dbc',
+            '#d2d6de',
+            '#3c8dbc',
+            '#3c8dbc',
+            '#3c8dbc',
+
+        ];
+        return $colors;
+    }
+
+
+    /**
+     * Format currency using comma for thousands until local info is property used.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v2.7]
+     * @return String
+     */
+    public static function ParseFloat($floatString)
+    {
+        $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);
+    }
+
+
+    /**
+     * Get the list of models in an array to make a dropdown menu
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v2.5]
+     * @return Array
+     */
+    public static function modelList()
+    {
+        $models = AssetModel::with('manufacturer')->get();
+        $model_array[''] = trans('general.select_model');
+        foreach ($models as $model) {
+            $model_array[$model->id] = $model->present()->modelName();
+        }
+        return $model_array;
+    }
+
+    /**
+     * Get the list of companies in an array to make a dropdown menu
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v2.5]
+     * @return Array
+     */
+    public static function companyList()
+    {
+        $company_list = array('' => trans('general.select_company')) + DB::table('companies')
+                ->orderBy('name', 'asc')
+                ->pluck('name', 'id')
+                ->toArray();
+        return $company_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 categoryList($category_type = null)
+    {
+        $categories = Category::orderBy('name', 'asc')
+                ->whereNull('deleted_at')
+                ->orderBy('name', 'asc');
+        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
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v2.5]
+     * @return Array
+     */
+    public static function suppliersList()
+    {
+        $supplier_list = array('' => trans('general.select_supplier')) + Supplier::orderBy('name', 'asc')
+                ->orderBy('name', 'asc')
+                ->pluck('name', 'id')->toArray();
+        return $supplier_list;
+    }
+
+
+    /**
+     * Get the list of status labels in an array to make a dropdown menu
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v2.5]
+     * @return Array
+     */
+    public static function statusLabelList()
+    {
+        $statuslabel_list = array('' => trans('general.select_statuslabel')) + Statuslabel::orderBy('deployable', 'desc')
+                ->pluck('name', 'id')->toArray();
+        return $statuslabel_list;
+    }
+
+
+    /**
+     * Get the list of locations in an array to make a dropdown menu
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v2.5]
+     * @return Array
+     */
+    public static function locationsList()
+    {
+        $location_list = array('' => trans('general.select_location')) + Location::orderBy('name', 'asc')
+                ->pluck('name', 'id')->toArray();
+        return $location_list;
+    }
+
+
+    /**
+     * Get the list of manufacturers in an array to make a dropdown menu
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v2.5]
+     * @return Array
+     */
+    public static function manufacturerList()
+    {
+        $manufacturer_list = array('' => trans('general.select_manufacturer')) +
+            Manufacturer::orderBy('name', 'asc')
+                ->pluck('name', 'id')->toArray();
+        return $manufacturer_list;
+    }
+
+    /**
+     * Get the list of status label types in an array to make a dropdown menu
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v2.5]
+     * @return Array
+     */
+    public static function statusTypeList()
+    {
+        $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;
+    }
+
+    /**
+     * Get the list of managers in an array to make a dropdown menu
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v2.5]
+     * @return Array
+     */
+    public static function managerList()
+    {
+        $manager_list = array('' => trans('general.select_user')) +
+                        User::where('deleted_at', '=', null)
+                        ->orderBy('last_name', 'asc')
+                        ->orderBy('first_name', 'asc')->get()
+                        ->pluck('complete_name', 'id')->toArray();
+
+        return $manager_list;
+    }
+
+    /**
+     * Get the list of depreciations in an array to make a dropdown menu
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v2.5]
+     * @return Array
+     */
+    public static function depreciationList()
+    {
+        $depreciation_list = ['' => 'Do Not Depreciate'] + Depreciation::orderBy('name', 'asc')
+                ->pluck('name', 'id')->toArray();
+        return $depreciation_list;
+    }
+
+    /**
+     * Get the list of category types in an array to make a dropdown menu
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v2.5]
+     * @return Array
+     */
+    public static function categoryTypeList()
+    {
+        $category_types = array('' => '','accessory' => 'Accessory', 'asset' => 'Asset', 'consumable' => 'Consumable','component' => 'Component');
+        return $category_types;
+    }
+
+    /**
+     * Get the list of users in an array to make a dropdown menu
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v2.5]
+     * @return Array
+     */
+    public static function usersList()
+    {
+        $users_list =   array( '' => trans('general.select_user')) +
+                        Company::scopeCompanyables(User::where('deleted_at', '=', null))
+                        ->where('show_in_list', '=', 1)
+                        ->orderBy('last_name', 'asc')
+                        ->orderBy('first_name', 'asc')->get()
+                        ->pluck('complete_name', 'id')->toArray();
+
+        return $users_list;
+    }
+
+    /**
+     * Get the list of assets in an array to make a dropdown menu
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v2.5]
+     * @return Array
+     */
+    public static function assetsList()
+    {
+        $assets_list = array('' => trans('general.select_asset')) + Asset::orderBy('name', 'asc')
+                ->whereNull('deleted_at')
+                ->pluck('name', 'id')->toArray();
+        return $assets_list;
+    }
+
+    /**
+     * Get the detailed list of assets in an array to make a dropdown menu
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v2.5]
+     * @return array
+     */
+    public static function detailedAssetList()
+    {
+        $assets = array('' => trans('general.select_asset')) + Company::scopeCompanyables(Asset::with('assignedTo', 'model'), 'assets.company_id')->get()->pluck('detailed_name', 'id')->toArray();
+        return $assets;
+    }
+
+
+    /**
+     * Get the list of custom fields in an array to make a dropdown menu
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v2.5]
+     * @return Array
+     */
+    public static function customFieldsetList()
+    {
+        $customfields = array('' => trans('admin/models/general.no_custom_field')) + CustomFieldset::pluck('name', 'id')->toArray();
+        return  $customfields;
+    }
+
+    /**
+     * Get the list of custom field formats in an array to make a dropdown menu
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.4]
+     * @return Array
+     */
+    public static function predefined_formats()
+    {
+        $keys = array_keys(CustomField::$PredefinedFormats);
+        $stuff = array_combine($keys, $keys);
+        return $stuff+["" => trans('admin/custom_fields/general.custom_format')];
+    }
+
+    /**
+     * Get the list of barcode dimensions
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.3]
+     * @return Array
+     */
+    public static function barcodeDimensions($barcode_type = 'QRCODE')
+    {
+        if ($barcode_type == 'C128') {
+            $size['height'] = '-1';
+            $size['width'] = '-10';
+        } elseif ($barcode_type == 'PDF417') {
+            $size['height'] = '-3';
+            $size['width'] = '-10';
+        } else {
+            $size['height'] = '-3';
+            $size['width'] = '-3';
+        }
+        return $size;
+    }
+
+    /**
+     * Generates a random string
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.0]
+     * @return Array
+     */
+    public static function generateRandomString($length = 10)
+    {
+        $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+        $charactersLength = strlen($characters);
+        $randomString = '';
+        for ($i = 0; $i < $length; $i++) {
+            $randomString .= $characters[rand(0, $charactersLength - 1)];
+        }
+        return $randomString;
+    }
+
+
+    /**
+     * This nasty little method gets the low inventory info for the
+     * alert dropdown
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.0]
+     * @return Array
+     */
+    public static function checkLowInventory()
+    {
+        $consumables = Consumable::with('users')->whereNotNull('min_amt')->get();
+        $accessories = Accessory::with('users')->whereNotNull('min_amt')->get();
+        $components = Component::with('assets')->whereNotNull('min_amt')->get();
+
+        $avail_consumables = 0;
+        $items_array = array();
+        $all_count = 0;
+
+        foreach ($consumables as $consumable) {
+            $avail = $consumable->numRemaining();
+            if ($avail < ($consumable->min_amt) + \App\Models\Setting::getSettings()->alert_threshold) {
+                if ($consumable->qty > 0) {
+                    $percent = number_format((($consumable->numRemaining() / $consumable->qty) * 100), 0);
+                } else {
+                    $percent = 100;
+                }
+
+                $items_array[$all_count]['id'] = $consumable->id;
+                $items_array[$all_count]['name'] = $consumable->name;
+                $items_array[$all_count]['type'] = 'consumables';
+                $items_array[$all_count]['percent'] = $percent;
+                $items_array[$all_count]['remaining']=$consumable->numRemaining();
+                $items_array[$all_count]['min_amt']=$consumable->min_amt;
+                $all_count++;
+            }
+
+
+        }
+
+        foreach ($accessories as $accessory) {
+            $avail = $accessory->numRemaining();
+            if ($avail < ($accessory->min_amt) + \App\Models\Setting::getSettings()->alert_threshold) {
+
+                if ($accessory->qty > 0) {
+                    $percent = number_format((($accessory->numRemaining() / $accessory->qty) * 100), 0);
+                } else {
+                    $percent = 100;
+                }
+
+                $items_array[$all_count]['id'] = $accessory->id;
+                $items_array[$all_count]['name'] = $accessory->name;
+                $items_array[$all_count]['type'] = 'accessories';
+                $items_array[$all_count]['percent'] = $percent;
+                $items_array[$all_count]['remaining']=$accessory->numRemaining();
+                $items_array[$all_count]['min_amt']=$accessory->min_amt;
+                $all_count++;
+            }
+
+        }
+
+        foreach ($components as $component) {
+            $avail = $component->numRemaining();
+            if ($avail < ($component->min_amt) + \App\Models\Setting::getSettings()->alert_threshold) {
+                if ($component->qty > 0) {
+                    $percent = number_format((($component->numRemaining() / $component->qty) * 100), 0);
+                } else {
+                    $percent = 100;
+                }
+
+                $items_array[$all_count]['id'] = $component->id;
+                $items_array[$all_count]['name'] = $component->name;
+                $items_array[$all_count]['type'] = 'components';
+                $items_array[$all_count]['percent'] = $percent;
+                $items_array[$all_count]['remaining']=$component->numRemaining();
+                $items_array[$all_count]['min_amt']=$component->min_amt;
+                $all_count++;
+            }
+
+        }
+
+
+
+        return $items_array;
+
+
+    }
+
+
+    /**
+     * Check if the file is an image, so we can show a preview
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.0]
+     * @param File $file
+     * @return String | Boolean
+     */
+    public static function checkUploadIsImage($file)
+    {
+        $finfo = @finfo_open(FILEINFO_MIME_TYPE); // return mime type ala mimetype extension
+        $filetype = @finfo_file($finfo, $file);
+        finfo_close($finfo);
+
+        if (($filetype=="image/jpeg") || ($filetype=="image/jpg")   || ($filetype=="image/png") || ($filetype=="image/bmp") || ($filetype=="image/gif")) {
+            return $filetype;
+        }
+
+        return false;
+    }
+
+    /**
+     * Walks through the permissions in the permissions config file and determines if
+     * permissions are granted based on a $selected_arr array.
+     *
+     * The $permissions array is a multidimensional array broke down by section.
+     * (Licenses, Assets, etc)
+     *
+     * The $selected_arr should be a flattened array that contains just the
+     * corresponding permission name and a true or false boolean to determine
+     * if that group/user has been granted that permission.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net]
+     * @param array $permissions
+     * @param array $selected_arr
+     * @since [v1.0]
+     * @return Array
+     */
+    public static function selectedPermissionsArray($permissions, $selected_arr = array())
+    {
+
+
+        $permissions_arr = array();
+
+        foreach ($permissions as $permission) {
+
+            for ($x = 0; $x < count($permission); $x++) {
+                $permission_name = $permission[$x]['permission'];
+
+                if ($permission[$x]['display'] === true) {
+
+                    if ($selected_arr) {
+                        if (array_key_exists($permission_name, $selected_arr)) {
+                            $permissions_arr[$permission_name] = $selected_arr[$permission_name];
+                        } else {
+                            $permissions_arr[$permission_name] = '0';
+                        }
+                    } else {
+                        $permissions_arr[$permission_name] = '0';
+                    }
+                }
+
+
+            }
+
+
+        }
+
+        return $permissions_arr;
+    }
+
+    /**
+     * Introspects into the model validation to see if the field passed is required.
+     * This is used by the blades to add a required class onto the HTML element.
+     * This isn't critical, but is helpful to keep form fields in sync with the actual
+     * model level validation.
+     *
+     * This does not currently handle form request validation requiredness :(
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.0]
+     * @return boolean
+     */
+    public static function checkIfRequired($class, $field)
+    {
+        $rules = $class::rules();
+        foreach ($rules as $rule_name => $rule) {
+            if ($rule_name == $field) {
+                if (strpos($rule, 'required') === false) {
+                    return false;
+                } else {
+                    return true;
+                }
+
+            }
+        }
+    }
+
+
+    /**
+     * Check to see if the given key exists in the array, and trim excess white space before returning it
+     *
+     * @author Daniel Melzter
+     * @since 3.0
+     * @param $array array
+     * @param $key string
+     * @param $default string
+     * @return string
+     */
+    public static function array_smart_fetch(array $array, $key, $default = '')
+    {
+        array_change_key_case($array, CASE_LOWER);
+        return array_key_exists(strtolower($key), array_change_key_case($array)) ? e(trim($array[ $key ])) : $default;
+    }
+
+
+    /**
+     * Gracefully handle decrypting the legacy data (encrypted via mcrypt) and use the new
+     * decryption method instead.
+     *
+     * This is not currently used, but will be.
+     *
+     * @author A. Gianotto
+     * @since 3.6
+     * @param CustomField $field
+     * @param String $string
+     * @return string
+     */
+    public static function gracefulDecrypt(CustomField $field, $string)
+    {
+
+        if ($field->isFieldDecryptable($string)) {
+
+            try {
+                Crypt::decrypt($string);
+                return Crypt::decrypt($string);
+
+            } catch (DecryptException $e) {
+                return 'Error Decrypting: '.$e->getMessage();
+            }
+
+        }
+        return $string;
+
+    }
+
+
+
+    public static function formatStandardApiResponse($status, $payload = null, $messages = null) {
+
+        $array['status'] = $status;
+        $array['messages'] = $messages;
+        if (($messages) && (count($messages) > 0)) {
+            $array['messages'] = $messages;
+        }
+        ($payload) ? $array['payload'] = $payload : $array['payload'] = null;
+        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'];
+
+    }
+
+
+
+}
@@ -0,0 +1,511 @@
+<?php
+namespace App\Http\Controllers;
+
+use App\Helpers\Helper;
+use App\Models\Accessory;
+use App\Models\Company;
+use App\Models\User;
+use Auth;
+use Carbon\Carbon;
+use Config;
+use DB;
+use Gate;
+use Input;
+use Lang;
+use Mail;
+use Redirect;
+use Illuminate\Http\Request;
+use Slack;
+use Str;
+use View;
+
+/** This controller handles all actions related to Accessories for
+ * the Snipe-IT Asset Management application.
+ *
+ * @version    v1.0
+ */
+class AccessoriesController extends Controller
+{
+
+    /**
+    * Returns a view that invokes the ajax tables which actually contains
+    * the content for the accessories listing, which is generated in getDatatable.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see AccessoriesController::getDatatable() method that generates the JSON response
+    * @since [v1.0]
+    * @return View
+    */
+    public function index(Request $request)
+    {
+        $this->authorize('index', Accessory::class);
+        return view('accessories/index');
+    }
+
+
+  /**
+   * Returns a view with a form to create a new Accessory.
+   *
+   * @author [A. Gianotto] [<snipe@snipe.net>]
+   * @return View
+   */
+    public function create(Request $request)
+    {
+        $this->authorize('create', Accessory::class);
+        // Show the page
+        return view('accessories/edit')
+          ->with('item', new Accessory)
+          ->with('category_list', Helper::categoryList('accessory'))
+          ->with('company_list', Helper::companyList())
+          ->with('location_list', Helper::locationsList())
+          ->with('manufacturer_list', Helper::manufacturerList());
+    }
+
+
+  /**
+   * Validate and save new Accessory from form post
+   *
+   * @author [A. Gianotto] [<snipe@snipe.net>]
+   * @return Redirect
+   */
+    public function store(Request $request)
+    {
+        $this->authorize(Accessory::class);
+        // create a new model instance
+        $accessory = new Accessory();
+
+        // Update the accessory data
+        $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()) {
+            // Redirect to the new accessory  page
+            return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.create.success'));
+        }
+        return redirect()->back()->withInput()->withErrors($accessory->getErrors());
+    }
+
+  /**
+   * Return view for the Accessory update form, prepopulated with existing data
+   *
+   * @author [A. Gianotto] [<snipe@snipe.net>]
+   * @param  int  $accessoryId
+   * @return View
+   */
+    public function edit(Request $request, $accessoryId = null)
+    {
+        // Check if the accessory exists
+        if (is_null($item = Accessory::find($accessoryId))) {
+            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
+        }
+
+        $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())
+          ->with('manufacturer_list', Helper::manufacturerList());
+    }
+
+
+  /**
+   * Save edited Accessory from form post
+   *
+   * @author [A. Gianotto] [<snipe@snipe.net>]
+   * @param  int  $accessoryId
+   * @return Redirect
+   */
+    public function update(Request $request, $accessoryId = null)
+    {
+        if (is_null($accessory = Accessory::find($accessoryId))) {
+            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
+        }
+
+        $this->authorize($accessory);
+
+        // 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()) {
+            return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.update.success'));
+        }
+        return redirect()->back()->withInput()->withErrors($accessory->getErrors());
+    }
+
+  /**
+   * Delete the given accessory.
+   *
+   * @author [A. Gianotto] [<snipe@snipe.net>]
+   * @param  int  $accessoryId
+   * @return Redirect
+   */
+    public function destroy(Request $request, $accessoryId)
+    {
+        if (is_null($accessory = Accessory::find($accessoryId))) {
+            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.not_found'));
+        }
+
+        $this->authorize($accessory);
+
+
+        if ($accessory->hasUsers() > 0) {
+             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'));
+    }
+
+
+
+  /**
+  * Returns a view that invokes the ajax table which  contains
+  * the content for the accessory detail view, which is generated in getDataView.
+  *
+  * @author [A. Gianotto] [<snipe@snipe.net>]
+  * @param  int  $accessoryID
+  * @see AccessoriesController::getDataView() method that generates the JSON response
+  * @since [v1.0]
+  * @return View
+  */
+    public function show(Request $request, $accessoryID = null)
+    {
+        $accessory = Accessory::find($accessoryID);
+        $this->authorize('view', $accessory);
+        if (isset($accessory->id)) {
+            return view('accessories/view', compact('accessory'));
+        }
+        // Prepare the error message
+        $error = trans('admin/accessories/message.does_not_exist', compact('id'));
+
+        // Redirect to the user management page
+        return redirect()->route('accessories')->with('error', $error);
+    }
+
+  /**
+   * Return the form to checkout an Accessory to a user.
+   *
+   * @author [A. Gianotto] [<snipe@snipe.net>]
+   * @param  int  $accessoryId
+   * @return View
+   */
+    public function getCheckout(Request $request, $accessoryId)
+    {
+        // Check if the accessory exists
+        if (is_null($accessory = Accessory::find($accessoryId))) {
+            // Redirect to the accessory management page with error
+            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.not_found'));
+        }
+
+        $this->authorize('checkout', $accessory);
+
+        // Get the dropdown of users and then pass it to the checkout view
+        return view('accessories/checkout', compact('accessory'))->with('users_list', Helper::usersList());
+
+    }
+
+  /**
+   * Save the Accessory checkout information.
+   *
+   * If Slack is enabled and/or asset acceptance is enabled, it will also
+   * trigger a Slack message and send an email.
+   *
+   * @author [A. Gianotto] [<snipe@snipe.net>]
+   * @param  int  $accessoryId
+   * @return Redirect
+   */
+    public function postCheckout(Request $request, $accessoryId)
+    {
+      // Check if the accessory exists
+        if (is_null($accessory = Accessory::find($accessoryId))) {
+            // Redirect to the accessory management page with error
+            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()->route('accessories.index')->with('error', trans('admin/accessories/message.not_found'));
+        }
+
+      // Update the accessory data
+        $accessory->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')), $user);
+
+        DB::table('accessories_users')->where('assigned_to', '=', $accessory->assigned_to)->where('accessory_id', '=', $accessory->id)->first();
+
+        $data['log_id'] = $logaction->id;
+        $data['eula'] = $accessory->getEula();
+        $data['first_name'] = $user->first_name;
+        $data['item_name'] = $accessory->name;
+        $data['checkout_date'] = $logaction->created_at;
+        $data['item_tag'] = '';
+        $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) {
+                $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_accessory_delivery'));
+            });
+        }
+
+      // Redirect to the new accessory page
+        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 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()->route('accessories.index')->with('error', trans('admin/accessories/message.not_found'));
+        }
+
+        $accessory = Accessory::find($accessory_user->accessory_id);
+        $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 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()->route('accessories.index')->with('error', trans('admin/accessories/message.not_found'));
+        }
+
+        $accessory = Accessory::find($accessory_user->accessory_id);
+
+        $this->authorize('checkin', $accessory);
+
+        $return_to = e($accessory_user->assigned_to);
+        $logaction = $accessory->logCheckin(User::find($return_to), e(Input::get('note')));
+
+        // Was the accessory updated?
+        if (DB::table('accessories_users')->where('id', '=', $accessory_user->id)->delete()) {
+            if (!is_null($accessory_user->assigned_to)) {
+                $user = User::find($accessory_user->assigned_to);
+            }
+
+            $data['log_id'] = $logaction->id;
+            $data['first_name'] = e($user->first_name);
+            $data['item_name'] = e($accessory->name);
+            $data['checkin_date'] = e($logaction->created_at);
+            $data['item_tag'] = '';
+            $data['note'] = e($logaction->note);
+
+            if (($accessory->checkin_email()=='1')) {
+
+                Mail::send('emails.checkin-asset', $data, function ($m) use ($user) {
+                    $m->to($user->email, $user->first_name . ' ' . $user->last_name);
+                    $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
+                    $m->subject(trans('mail.Confirm_Accessory_Checkin'));
+                });
+            }
+
+            if ($backto=='user') {
+                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()->route('accessories.index')->with('error', trans('admin/accessories/message.checkin.error'));
+    }
+
+    /**
+     * Generates the JSON response for accessories listing view.
+     *
+     * Example:
+     * {
+     *  "actions": "(links to available actions)",
+     *  "category": "(link to category)",
+     *  "company": "My Company",
+     *  "location":  "My Location",
+     *  "min_amt": 2,
+     *  "name":  "(link to accessory),
+     *  "numRemaining": 6,
+     *  "order_number": null,
+     *  "purchase_cost": "0.00",
+     *  "purchase_date": null,
+     *  "qty": 7
+     *  },
+     *
+     * The names of the fields in the returns JSON correspond directly to the the
+     * names of the fields in the bootstrap-tables in the view.
+     *
+     * For debugging, see at /api/accessories/list
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param Request $request
+     * @return string JSON containing accessories and their associated atrributes.
+     * @internal param int $accessoryId
+     */
+    public function getDatatable(Request $request)
+    {
+        $this->authorize('index', Accessory::class);
+        $accessories = Company::scopeCompanyables(
+            Accessory::select('accessories.*')
+            ->whereNull('accessories.deleted_at')
+            ->with('category', 'company', 'manufacturer', 'users', 'location')
+        );
+        if (Input::has('search')) {
+            $accessories = $accessories->TextSearch(e(Input::get('search')));
+        }
+        $offset = request('offset', 0);
+        $limit = request('limit', 50);
+
+        $allowed_columns = ['name','min_amt','order_number','purchase_date','purchase_cost','company','category','model_number', 'manufacturer', 'location'];
+        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array(Input::get('sort'), $allowed_columns) ? e(Input::get('sort')) : 'created_at';
+
+        switch ($sort) {
+            case 'category':
+                $accessories = $accessories->OrderCategory($order);
+                break;
+            case 'company':
+                $accessories = $accessories->OrderCompany($order);
+                break;
+            case 'location':
+                $accessories = $accessories->OrderLocation($order);
+                break;
+            case 'manufacturer':
+                $accessories = $accessories->OrderManufacturer($order);
+                break;
+            default:
+                $accessories = $accessories->orderBy($sort, $order);
+                break;
+        }
+
+        $accessCount = $accessories->count();
+        $accessories = $accessories->skip($offset)->take($limit)->get();
+
+        $rows = array();
+
+        foreach ($accessories as $accessory) {
+            $rows[] = $accessory->present()->forDataTable();
+        }
+
+        $data = array('total'=>$accessCount, 'rows'=>$rows);
+
+        return $data;
+    }
+
+
+  /**
+  * Generates the JSON response for accessory detail view.
+  *
+  * Example:
+  * <code>
+  * {
+  * "rows": [
+  * {
+  * "actions": "(link to available actions)",
+  * "name": "(link to user)"
+  * }
+  * ],
+  * "total": 1
+  * }
+  * </code>
+  *
+  * The names of the fields in the returns JSON correspond directly to the the
+  * names of the fields in the bootstrap-tables in the view.
+  *
+  * For debugging, see at /api/accessories/$accessoryID/view
+  *
+  * @author [A. Gianotto] [<snipe@snipe.net>]
+  * @param  int  $accessoryId
+  * @return string JSON containing accessories and their associated atrributes.
+  **/
+    public function getDataView(Request $request, $accessoryID)
+    {
+        $accessory = Accessory::find($accessoryID);
+
+        if (!Company::isCurrentUserHasAccess($accessory)) {
+            return ['total' => 0, 'rows' => []];
+        }
+
+        $accessory_users = $accessory->users;
+        $count = $accessory_users->count();
+
+        $rows = array();
+
+        foreach ($accessory_users as $user) {
+            $actions = '';
+            if (Gate::allows('checkin', $accessory)) {
+                $actions .= Helper::generateDatatableButton('checkin', route('checkin/accessory', $user->pivot->id));
+            }
+
+            if (Gate::allows('view', $user)) {
+                $name = (string) link_to_route('users.show', e($user->present()->fullName()), [$user->id]);
+            } else {
+                $name = e($user->present()->fullName());
+            }
+
+            $rows[] = array(
+              'name'          => $name,
+              'actions'       => $actions
+              );
+        }
+
+        $data = array('total'=>$count, 'rows'=>$rows);
+
+        return $data;
+    }
+}
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Helpers\Helper;
+use Response;
+
+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);
+        return Response::make($contents)->header('Content-Type', $filetype);
+    }
+}
@@ -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')));
+
+    }
+}
@@ -0,0 +1,227 @@
+<?php
+namespace App\Http\Controllers\Api;
+
+use App\Helpers\Helper;
+use App\Http\Controllers\Controller;
+use App\Http\Transformers\AssetMaintenancesTransformer;
+use App\Models\Asset;
+use App\Models\AssetMaintenance;
+use App\Models\Company;
+use Auth;
+use Carbon\Carbon;
+use Gate;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Input;
+
+/**
+ * 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);
+
+    }
+}
@@ -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')));
+
+    }
+}
@@ -0,0 +1,545 @@
+<?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','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')));
+    }
+
+
+    /**
+     * Mark an asset as audited
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param int $id
+     * @since [v4.0]
+     * @return JsonResponse
+     */
+    public function audit(Request $request) {
+
+
+        $this->authorize('audit', Asset::class);
+        $rules = array(
+            'asset_tag' => 'required',
+            'location_id' => 'exists:locations,id|nullable|numeric',
+            'next_audit_date' => 'date|nullable'
+        );
+
+        $validator = Validator::make($request->all(), $rules);
+        if ($validator->fails()) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, $validator->errors()->all()));
+        }
+
+        $asset = Asset::where('asset_tag','=', $request->input('asset_tag'))->first();
+
+
+        if ($asset) {
+            $asset->next_audit_date = $request->input('next_audit_date');
+            if ($asset->save()) {
+                $log = $asset->logAudit(request('note'),request('location_id'));
+                return response()->json(Helper::formatStandardApiResponse('success', [
+                    'asset_tag'=> e($asset->asset_tag),
+                    'note'=> e($request->input('note')),
+                    'next_audit_date' => Helper::getFormattedDateObject($log->calcNextAuditDate())
+                ], trans('admin/hardware/message.audit.success')));
+            }
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', ['asset_tag'=> e($request->input('asset_tag'))], 'Asset with tag '.$request->input('asset_tag').' not found'));
+
+
+
+
+
+    }
+}
@@ -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')));
+
+    }
+}
@@ -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;
+            }
+        }
+
+    }
+}
@@ -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);
+    }
+}
@@ -0,0 +1,194 @@
+<?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')));
+    }
+
+        /**
+    * Returns a JSON response containing details on the users associated with this consumable.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see ConsumablesController::getView() method that returns the form.
+    * @since [v1.0]
+    * @param int $consumableId
+    * @return array
+     */
+    public function getDataView($consumableId)
+    {
+        //$consumable = Consumable::find($consumableID);
+        $consumable = Consumable::with(array('consumableAssignments'=>
+        function ($query) {
+            $query->orderBy('created_at', 'DESC');
+        },
+        'consumableAssignments.admin'=> function ($query) {
+        },
+        'consumableAssignments.user'=> function ($query) {
+        },
+        ))->find($consumableId);
+
+        //  $consumable->load('consumableAssignments.admin','consumableAssignments.user');
+
+        if (!Company::isCurrentUserHasAccess($consumable)) {
+            return ['total' => 0, 'rows' => []];
+        }
+        $this->authorize('view', Component::class);
+        $rows = array();
+
+        foreach ($consumable->consumableAssignments as $consumable_assignment) {
+            $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();
+        $data = array('total' => $consumableCount, 'rows' => $rows);
+        return $data;
+    }
+}
@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Http\Controllers\Controller;
+use App\Http\Transformers\CustomFieldsTransformer;
+use App\Models\CustomField;
+use App\Models\CustomFieldset;
+use Illuminate\Http\Request;
+
+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 index()
+    {
+        $this->authorize('index', CustomFields::class);
+        $fields = CustomField::get();
+
+        $total = count($fields);
+        return (new CustomFieldsTransformer)->transformCustomFields($fields, $total);
+    }
+    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')));
+
+        }
+    }
+
+}
@@ -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'));
+
+
+        
+    }
+
+}
@@ -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')));
+
+    }
+
+}
@@ -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')));
+
+    }
+
+
+
+}
@@ -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')));
+
+    }
+
+
+}
@@ -0,0 +1,150 @@
+<?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;
+use Artisan;
+
+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);
+        // Run a backup immediately before processing
+        Artisan::call('backup:run');
+        $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);
+        }
+    }
+}
@@ -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', 'supplier'));
+
+        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)
+    {
+        //
+    }
+}
@@ -0,0 +1,135 @@
+<?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', 'manager_id'];
+
+        $locations = Location::select([
+            'locations.id',
+            'locations.name',
+            'locations.address',
+            'locations.address2',
+            'locations.city',
+            'locations.state',
+            'locations.zip',
+            'locations.country',
+            'locations.parent_id',
+            'locations.manager_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')));
+
+    }
+}
@@ -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')));
+
+    }
+}
@@ -0,0 +1,60 @@
+<?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','location');
+
+        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')));
+        }
+
+        if ($request->has('action_type')) {
+            $actionlogs = $actionlogs->where('action_type','=',$request->input('action_type'))->orderBy('created_at', 'desc');
+        }
+
+        $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);
+
+
+
+    }
+}
@@ -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);
+        }
+
+
+    }
+
+}
@@ -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';
+    }
+}
@@ -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')));
+
+    }
+}
@@ -0,0 +1,207 @@
+<?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;
+use App\Models\Asset;
+
+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('deleted')) && ($request->input('deleted')=='true')) {
+            $users = $users->GetDeleted();
+        }
+
+
+        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')));
+    }
+
+    /**
+     * Return JSON containing a list of assets assigned to a user.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.0]
+     * @param $userId
+     * @return string JSON
+     */
+    public function assets($id)
+    {
+        $this->authorize('view', User::class);
+        $assets = Asset::where('assigned_to', '=', $id)->with('model')->get();
+        return response()->json($assets);
+    }
+}
@@ -0,0 +1,389 @@
+<?php
+namespace App\Http\Controllers;
+
+use App\Models\AssetMaintenance;
+use Carbon\Carbon;
+use App\Models\Company;
+use DB;
+use Input;
+use Lang;
+use Log;
+use Mail;
+use Response;
+use Slack;
+use Str;
+use TCPDF;
+use Validator;
+use View;
+use App\Models\Setting;
+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
+ * the Snipe-IT Asset Management application.
+ *
+ * @version    v2.0
+ */
+class AssetMaintenancesController extends Controller
+{
+
+    /**
+    * Checks for permissions for this action.
+    *
+    * @todo This should be replaced with middleware and/or policies
+    * @author  Vincent Sposato <vincent.sposato@gmail.com>
+    * @version v1.0
+    * @since [v1.8]
+    * @return View
+    */
+    private static function getInsufficientPermissionsRedirect()
+    {
+        return redirect()->route('maintenances.index')
+          ->with('error', trans('general.insufficient_permissions'));
+    }
+
+    /**
+    *  Returns a view that invokes the ajax tables which actually contains
+    * the content for the asset maintenances listing, which is generated in getDatatable.
+    *
+    * @todo This should be replaced with middleware and/or policies
+    * @see AssetMaintenancesController::getDatatable() method that generates the JSON response
+    * @author  Vincent Sposato <vincent.sposato@gmail.com>
+    * @version v1.0
+    * @since [v1.8]
+    * @return View
+    */
+    public function index()
+    {
+        return view('asset_maintenances/index');
+    }
+
+
+    /**
+    *  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 getDatatable(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;
+        }
+
+        $maintenancesCount = $maintenances->count();
+        $maintenances = $maintenances->skip($offset)->take($limit)->get();
+
+        $rows = array();
+        $settings = Setting::getSettings();
+
+        foreach ($maintenances as $maintenance) {
+            $actions = '';
+            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!='')) {
+                $maintenance_cost = $maintenance->asset->assetloc->currency.$maintenance->cost;
+            } else {
+                $maintenance_cost = $settings->default_currency.$maintenance->cost;
+            }
+
+            $rows[] = array(
+                'id'            => $maintenance->id,
+                '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_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_route('users.show', $maintenance->admin->present()->fullName(), ['user'=>$maintenance->admin->id]) : '',
+                'actions'       => $actions,
+                'company'   => ($maintenance->asset->company) ? $maintenance->asset->company->name : ''
+            );
+        }
+
+        $data = array('total' => $maintenancesCount, 'rows' => $rows);
+        return $data;
+
+    }
+
+    /**
+     *  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
+        // Render the view
+        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);
+    }
+
+    /**
+    *  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 mixed
+    */
+    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 static::getInsufficientPermissionsRedirect();
+        }
+
+        // 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()) {
+            // Redirect to the new asset maintenance page
+            return redirect()->route('maintenances.index')
+                           ->with('success', trans('admin/asset_maintenances/message.create.success'));
+        }
+
+        return redirect()->back()->withInput()->withErrors($assetMaintenance->getErrors());
+
+    }
+
+    /**
+    *  Returns a form view to edit a selected 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 edit($assetMaintenanceId = null)
+    {
+        // Check if the asset maintenance exists
+        if (is_null($assetMaintenance = AssetMaintenance::find($assetMaintenanceId))) {
+            // Redirect to the improvement management page
+            return redirect()->route('maintenances.index')
+                           ->with('error', trans('admin/asset_maintenances/message.not_found'));
+        } elseif (!Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
+            return static::getInsufficientPermissionsRedirect();
+        }
+
+        if ($assetMaintenance->completion_date == '0000-00-00') {
+            $assetMaintenance->completion_date = null;
+        }
+
+        if ($assetMaintenance->start_date == '0000-00-00') {
+            $assetMaintenance->start_date = null;
+        }
+
+        if ($assetMaintenance->cost == '0.00') {
+            $assetMaintenance->cost = null;
+        }
+
+        // Prepare Improvement Type List
+        $assetMaintenanceType = [
+                                    '' => 'Select an improvement type',
+                                ] + AssetMaintenance::getImprovementOptions();
+
+        // Get Supplier List
+        // Render the view
+        return view('asset_maintenances/edit')
+                   ->with('asset_list', Helper::detailedAssetList())
+                   ->with('selectedAsset', null)
+                   ->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 Request $request
+     * @param int $assetMaintenanceId
+     * @return mixed
+     * @version v1.0
+     * @since [v1.8]
+     */
+    public function update(Request $request, $assetMaintenanceId = null)
+    {
+        // Check if the asset maintenance exists
+        if (is_null($assetMaintenance = AssetMaintenance::find($assetMaintenanceId))) {
+            // Redirect to the asset maintenance management page
+            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'));
+
+        $asset = Asset::find(request('asset_id'));
+
+        if (!Company::isCurrentUserHasAccess($asset)) {
+            return static::getInsufficientPermissionsRedirect();
+        }
+
+        // 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()) {
+
+            // Redirect to the new asset maintenance page
+            return redirect()->route('maintenances.index')
+                         ->with('success', trans('admin/asset_maintenances/message.edit.success'));
+        }
+        return redirect()->back()->withInput()->withErrors($assetMaintenance->getErrors());
+    }
+
+    /**
+    *  Delete an asset maintenance
+    *
+    * @author  Vincent Sposato <vincent.sposato@gmail.com>
+    * @param int $assetMaintenanceId
+    * @version v1.0
+    * @since [v1.8]
+    * @return mixed
+    */
+    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()->route('maintenances.index')
+                           ->with('error', trans('admin/asset_maintenances/message.not_found'));
+        } elseif (!Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
+            return static::getInsufficientPermissionsRedirect();
+        }
+
+        // Delete the asset maintenance
+        $assetMaintenance->delete();
+
+        // Redirect to the asset_maintenance management page
+        return redirect()->route('maintenances.index')
+                       ->with('success', trans('admin/asset_maintenances/message.delete.success'));
+    }
+
+    /**
+    *  View an asset maintenance
+    *
+    * @author  Vincent Sposato <vincent.sposato@gmail.com>
+    * @param int $assetMaintenanceId
+    * @version v1.0
+    * @since [v1.8]
+    * @return View
+    */
+    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()->route('maintenances.index')
+                           ->with('error', trans('admin/asset_maintenances/message.not_found'));
+        } elseif (!Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
+            return static::getInsufficientPermissionsRedirect();
+        }
+
+        return view('asset_maintenances/view')->with('assetMaintenance', $assetMaintenance);
+    }
+}
@@ -0,0 +1,466 @@
+<?php
+namespace App\Http\Controllers;
+
+use App\Models\CustomField;
+use Image;
+use Input;
+use Lang;
+use App\Models\AssetModel;
+use Redirect;
+use Auth;
+use DB;
+use Str;
+use Validator;
+use View;
+use App\Models\Asset;
+use App\Models\Company;
+use Config;
+use App\Helpers\Helper;
+use Illuminate\Http\Request;
+
+use Symfony\Component\HttpFoundation\JsonResponse;
+
+/**
+ * This class controls all actions related to asset models for
+ * the Snipe-IT Asset Management application.
+ *
+ * @version    v1.0
+ * @author [A. Gianotto] [<snipe@snipe.net>]
+ */
+class AssetModelsController extends Controller
+{
+    /**
+    * Returns a view that invokes the ajax tables which actually contains
+    * the content for the accessories listing, which is generated in getDatatable.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see AssetModelsController::getDatatable() method that generates the JSON response
+    * @since [v1.0]
+    * @return View
+    */
+    public function index()
+    {
+        return view('models/index');
+    }
+
+    /**
+    * Returns a view containing the asset model creation form.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @return View
+    */
+    public function create()
+    {
+        // Show the page
+        return view('models/edit')
+        ->with('category_list', Helper::categoryList('asset'))
+        ->with('depreciation_list', Helper::depreciationList())
+        ->with('manufacturer_list', Helper::manufacturerList())
+        ->with('item', new AssetModel);
+    }
+
+
+    /**
+    * Validate and process the new Asset Model data.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @return Redirect
+    */
+    public function store(Request $request)
+    {
+
+        // Create a new asset model
+        $model = new AssetModel;
+
+        // Save the model data
+        $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::id();
+        $model->requestable         = Input::has('requestable');
+
+        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();
+            $path = public_path('uploads/models/'.$file_name);
+            Image::make($image->getRealPath())->resize(500, null, function ($constraint) {
+                $constraint->aspectRatio();
+                $constraint->upsize();
+            })->save($path);
+            $model->image = $file_name;
+        }
+
+            // Was it created?
+        if ($model->save()) {
+            // Redirect to the new model  page
+            return redirect()->route("models.index")->with('success', trans('admin/models/message.create.success'));
+        }
+        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]
+     * @param Request $request
+     * @return String JSON
+     */
+    public function apiStore(Request $request)
+    {
+      //COPYPASTA!!!! FIXME
+        $model = new AssetModel;
+
+        $settings=Input::all();
+        $settings['eol']= null;
+
+        $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 ($request->input('fieldset_id')=='') {
+            $model->fieldset_id = null;
+        } else {
+            $model->fieldset_id = e($request->input('fieldset_id'));
+        }
+
+        if ($model->save()) {
+            return JsonResponse::create($model);
+        } else {
+            return JsonResponse::create(["error" => "Failed validation: ".print_r($model->getErrors()->all('<li>:message</li>'), true)], 500);
+        }
+    }
+
+
+    /**
+    * Returns a view containing the asset model edit form.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @param int $modelId
+    * @return View
+    */
+    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()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));
+        }
+
+        $view = View::make('models/edit', compact('item'));
+        $view->with('category_list', Helper::categoryList('asset'));
+        $view->with('depreciation_list', Helper::depreciationList());
+        $view->with('manufacturer_list', Helper::manufacturerList());
+        return $view;
+    }
+
+
+    /**
+    * Validates and processes form data from the edit
+    * Asset Model form based on the model ID passed.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @param int $modelId
+    * @return Redirect
+    */
+    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()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));
+        }
+
+        $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 ($request->input('custom_fieldset')=='') {
+            $model->fieldset_id = null;
+        } else {
+            $model->fieldset_id = $request->input('custom_fieldset');
+        }
+
+        if (Input::file('image')) {
+            $image = Input::file('image');
+            $file_name = str_random(25).".".$image->getClientOriginalExtension();
+            $path = public_path('uploads/models/'.$file_name);
+            Image::make($image->getRealPath())->resize(300, null, function ($constraint) {
+                $constraint->aspectRatio();
+                $constraint->upsize();
+            })->save($path);
+            $model->image = $file_name;
+        }
+
+        if ($request->input('image_delete') == 1 && Input::file('image') == "") {
+            $model->image = null;
+        }
+
+        if ($model->save()) {
+            return redirect()->route("models.index")->with('success', trans('admin/models/message.update.success'));
+        }
+        return redirect()->back()->withInput()->withErrors($model->getErrors());
+    }
+
+    /**
+    * Validate and delete the given Asset Model. An Asset Model
+    * cannot be deleted if there are associated assets.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @param int $modelId
+    * @return Redirect
+    */
+    public function destroy($modelId)
+    {
+        // Check if the model exists
+        if (is_null($model = AssetModel::find($modelId))) {
+            return redirect()->route('models.index')->with('error', trans('admin/models/message.not_found'));
+        }
+
+        if ($model->assets()->count() > 0) {
+            // Throw an error that this model is associated with assets
+            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'));
+    }
+
+
+    /**
+    * Restore a given Asset Model (mark as un-deleted)
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @param int $modelId
+    * @return Redirect
+    */
+    public function getRestore($modelId = null)
+    {
+
+        // Get user information
+        $model = AssetModel::withTrashed()->find($modelId);
+
+        if (isset($model->id)) {
+
+            // Restore the model
+            $model->restore();
+
+            // Prepare the success message
+            $success = trans('admin/models/message.restore.success');
+
+            // Redirect back
+            return redirect()->route('models.index')->with('success', $success);
+
+        }
+        return redirect()->back()->with('error', trans('admin/models/message.not_found'));
+
+    }
+
+
+    /**
+    * Get the model information to present to the model view page
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @param int $modelId
+    * @return View
+    */
+    public function show($modelId = null)
+    {
+        $model = AssetModel::withTrashed()->find($modelId);
+
+        if (isset($model->id)) {
+            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);
+    }
+
+    /**
+    * Get the clone page to clone a model
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @param int $modelId
+    * @return View
+    */
+    public function getClone($modelId = null)
+    {
+        // Check if the model exists
+        if (is_null($model_to_clone = AssetModel::find($modelId))) {
+            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
+        $view = View::make('models/edit');
+        $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;
+
+    }
+
+
+    /**
+    * Get the custom fields form
+    *
+    * @author [B. Wetherington] [<uberbrady@gmail.com>]
+    * @since [v2.0]
+    * @param int $modelId
+    * @return View
+    */
+    public function getCustomFields($modelId)
+    {
+        $model = AssetModel::find($modelId);
+        return view("models.custom_fields_form")->with("model", $model);
+    }
+
+
+
+    /**
+     * Get the asset information to present to the model view detail page
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v2.0]
+     * @param Request $request
+     * @param $modelID
+     * @return String JSON
+     * @internal param int $modelId
+     */
+    public function getDataView(Request $request, $modelID)
+    {
+        $assets = Asset::where('model_id', '=', $modelID)->with('company', 'assetstatus');
+
+        if (Input::has('search')) {
+            $assets = $assets->TextSearch(e($request->input('search')));
+        }
+        $offset = request('offset', 0);
+        $limit = request('limit', 50);
+
+
+        $allowed_columns = ['name', 'serial','asset_tag'];
+        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';
+
+        $assets = $assets->orderBy($sort, $order);
+
+        $assetsCount = $assets->count();
+        $assets = $assets->skip($offset)->take($limit)->get();
+
+        $rows = array();
+
+        $all_custom_fields = CustomField::all();
+        foreach ($assets as $asset) {
+
+            $rows[] = $asset->present()->forDataTable($all_custom_fields);
+        }
+
+        $data = array('total' => $assetsCount, 'rows' => $rows);
+
+        return $data;
+    }
+
+
+    /**
+     * Returns a view that allows the user to bulk edit model attrbutes
+     *
+     * @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'));
+
+    }
+
+}
@@ -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)]
+        );
+    }
+}
@@ -0,0 +1,323 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use Validator;
+use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\ThrottlesLogins;
+use App\Models\Setting;
+use App\Models\Ldap;
+use App\Models\User;
+use Auth;
+use Config;
+use Illuminate\Http\Request;
+use Input;
+use Redirect;
+use Log;
+use View;
+use PragmaRX\Google2FA\Google2FA;
+
+/**
+ * This controller handles authentication for the user, including local
+ * database users and LDAP users.
+ *
+ * @author [A. Gianotto] [<snipe@snipe.net>]
+ * @version    v1.0
+ */
+class LoginController extends Controller
+{
+
+    use ThrottlesLogins;
+
+    // This tells the auth controller to use username instead of email address
+    protected $username = 'username';
+
+    /**
+     * Where to redirect users after login / registration.
+     *
+     * @var string
+     */
+    protected $redirectTo = '/';
+
+    /**
+     * Create a new authentication controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('guest', ['except' => ['logout','postTwoFactorAuth','getTwoFactorAuth','getTwoFactorEnroll']]);
+    }
+
+
+    function showLoginForm()
+    {
+        if (Auth::check()) {
+            return redirect()->intended('dashboard');
+        }
+        return view('auth.login');
+    }
+
+
+    private function login_via_ldap(Request $request)
+    {
+        LOG::debug("Binding user to LDAP.");
+        $ldap_user = Ldap::findAndBindUserLdap($request->input('username'), $request->input('password'));
+        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 {
+            LOG::debug("LDAP user ".$request->input('username')." successfully bound to LDAP");
+        }
+
+        // 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();
+        LOG::debug("Local auth lookup complete");
+
+        // The user does not exist in the database. Try to get them from LDAP.
+        // If user does not exist and authenticates successfully with LDAP we
+        // will create it on the fly and sign in with default permissions
+        if (!$user) {
+            LOG::debug("Local user ".Input::get('username')." does not exist");
+            LOG::debug("Creating local user ".Input::get('username'));
+
+            if ($user = Ldap::createUserFromLdap($ldap_user)) { //this handles passwords on its own
+                LOG::debug("Local user created.");
+            } else {
+                LOG::debug("Could not create local user.");
+                throw new \Exception("Could not create local user");
+            }
+            // If the user exists and they were imported from LDAP already
+        } else {
+            LOG::debug("Local user ".$request->input('username')." exists in database. Updating existing user against LDAP.");
+
+            $ldap_attr = Ldap::parseAndMapLdapAttributes($ldap_user);
+
+            if (Setting::getSettings()->ldap_pw_sync=='1') {
+                $user->password = bcrypt($request->input('password'));
+            }
+
+            $user->email = $ldap_attr['email'];
+            $user->first_name = $ldap_attr['firstname'];
+            $user->last_name = $ldap_attr['lastname'];
+            $user->save();
+        } // End if(!user)
+        return $user;
+    }
+
+
+    /**
+     * Account sign in form processing.
+     *
+     * @return Redirect
+     */
+    public function login(Request $request)
+    {
+        $validator = $this->validator(Input::all());
+
+        if ($validator->fails()) {
+            return redirect()->back()->withInput()->withErrors($validator);
+        }
+
+        $this->maxLoginAttempts = config('auth.throttle.max_attempts');
+        $this->lockoutTime = config('auth.throttle.lockout_duration');
+
+        if ($lockedOut = $this->hasTooManyLoginAttempts($request)) {
+            $this->fireLockoutEvent($request);
+            return $this->sendLockoutResponse($request);
+        }
+
+        $user = null;
+
+        // Should we even check for LDAP users?
+        if (Setting::getSettings()->ldap_enabled=='1') {
+            LOG::debug("LDAP is enabled.");
+            try {
+                $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.
+            } catch (\Exception $e) {
+                LOG::error("There was an error authenticating the LDAP user: ".$e->getMessage());
+            }
+        }
+
+        // If the user wasn't authenticated via LDAP, skip to local auth
+        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 (!$lockedOut) {
+                    $this->incrementLoginAttempts($request);
+                }
+
+                LOG::debug("Local authentication failed.");
+                return redirect()->back()->withInput()->with('error', trans('auth/message.account_not_found'));
+            } else {
+
+                  $this->clearLoginAttempts($request);
+            }
+        }
+
+        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()->intended()->with('success', trans('auth/message.signin.success'));
+    }
+
+
+    /**
+     * Two factor enrollment page
+     *
+     * @return Redirect
+     */
+    public function getTwoFactorEnroll()
+    {
+
+        if (!Auth::check()) {
+            return redirect()->route('login')->with('error', 'You must be logged in.');
+        }
+
+        $user = Auth::user();
+        $google2fa = app()->make('PragmaRX\Google2FA\Contracts\Google2FA');
+
+        if ($user->two_factor_secret=='') {
+            $user->two_factor_secret = $google2fa->generateSecretKey(32);
+            $user->save();
+        }
+
+
+        $google2fa_url = $google2fa->getQRCodeGoogleUrl(
+            urlencode(Setting::getSettings()->site_name),
+            urlencode($user->username),
+            $user->two_factor_secret
+        );
+
+        return view('auth.two_factor_enroll')->with('google2fa_url', $google2fa_url);
+
+    }
+
+
+    /**
+     * Two factor code form page
+     *
+     * @return Redirect
+     */
+    public function getTwoFactorAuth()
+    {
+        return view('auth.two_factor');
+    }
+
+    /**
+     * Two factor code submission
+     *
+     * @return Redirect
+     */
+    public function postTwoFactorAuth(Request $request)
+    {
+
+        if (!Auth::check()) {
+            return redirect()->route('login')->with('error', 'You must be logged in.');
+        }
+
+        $user = Auth::user();
+        $secret = $request->get('two_factor_secret');
+        $google2fa = app()->make('PragmaRX\Google2FA\Contracts\Google2FA');
+        $valid = $google2fa->verifyKey($user->two_factor_secret, $secret);
+
+        if ($valid) {
+            $user->two_factor_enrolled = 1;
+            $user->save();
+            $request->session()->put('2fa_authed', 'true');
+            return redirect()->route('home')->with('success', 'You are logged in!');
+        }
+
+        return redirect()->route('two-factor')->with('error', 'Invalid two-factor code');
+
+
+    }
+
+
+    /**
+     * Logout page.
+     *
+     * @return Redirect
+     */
+    public function logout(Request $request)
+    {
+        $request->session()->forget('2fa_authed');
+        Auth::logout();
+        return redirect()->route('login')->with('success', 'You have successfully logged out!');
+    }
+
+
+    /**
+     * Get a validator for an incoming registration request.
+     *
+     * @param  array  $data
+     * @return \Illuminate\Contracts\Validation\Validator
+     */
+    protected function validator(array $data)
+    {
+        return Validator::make($data, [
+            'username' => 'required',
+            'password' => 'required',
+        ]);
+    }
+
+
+    public function username()
+    {
+        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');
+    }
+
+}
@@ -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');
+    }
+}
@@ -0,0 +1,216 @@
+<?php
+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;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Gate;
+use Input;
+use Lang;
+use Redirect;
+use Str;
+use View;
+
+/**
+ * This class controls all actions related to Categories for
+ * the Snipe-IT Asset Management application.
+ *
+ * @version    v1.0
+ * @author [A. Gianotto] [<snipe@snipe.net>]
+ */
+class CategoriesController extends Controller
+{
+
+    /**
+    * Returns a view that invokes the ajax tables which actually contains
+    * the content for the categories listing, which is generated in getDatatable.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see CategoriesController::getDatatable() method that generates the JSON response
+    * @since [v1.0]
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function index()
+    {
+        // Show the page
+        return view('categories/index');
+    }
+
+
+    /**
+    * Returns a form view to create a new category.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see CategoriesController::store() method that stores the data
+    * @since [v1.0]
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function create()
+    {
+        // Show the page
+         $category_types= Helper::categoryTypeList();
+        return view('categories/edit')->with('item', new Category)
+            ->with('category_types', $category_types);
+    }
+
+
+    /**
+    * Validates and stores the new category data.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see CategoriesController::create() method that makes the form.
+    * @since [v1.0]
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function store(Request $request)
+    {
+        // create a new model instance
+        $category = new Category();
+        // Update the category data
+        $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()) {
+            return redirect()->route('categories.index')->with('success', trans('admin/categories/message.create.success'));
+        }
+
+        return redirect()->back()->withInput()->withErrors($category->getErrors());
+    }
+
+    /**
+    * Returns a view that makes a form to update a category.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see CategoriesController::postEdit() method saves the data
+    * @param int $categoryId
+    * @since [v1.0]
+    * @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'));
+        }
+        $category_types= Helper::categoryTypeList();
+
+        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 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 categories management page
+            return redirect()->to('admin/categories')->with('error', trans('admin/categories/message.does_not_exist'));
+        }
+
+        // Update the category data
+        $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        = $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()->route('categories.index')->with('success', trans('admin/categories/message.update.success'));
+        }
+        // The given data did not pass validation
+        return redirect()->back()->withInput()->withErrors($category->getErrors());
+    }
+
+    /**
+    * Validates and marks a category as deleted.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @param int $categoryId
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy($categoryId)
+    {
+        // Check if the category exists
+        if (is_null($category = Category::find($categoryId))) {
+            return redirect()->to('admin/settings/categories')->with('error', trans('admin/categories/message.not_found'));
+        }
+
+        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']));
+        }
+
+        $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.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see CategoriesController::getDataView() method that generates the JSON response
+    * @param int $categoryId
+    * @since [v1.8]
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function show($id)
+    {
+        if ($category = Category::find($id)) {
+
+            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 {
+                $category_type = $category->category_type;
+                $category_type_route = $category->category_type.'s';
+            }
+            return view('categories/view', compact('category'))
+                ->with('category_type',$category_type)
+                ->with('category_type_route',$category_type_route);
+        }
+
+        // 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);
+    }
+
+
+}
@@ -0,0 +1,152 @@
+<?php
+namespace App\Http\Controllers;
+
+use App\Models\Company;
+use Input;
+use Lang;
+use Redirect;
+use View;
+use Illuminate\Http\Request;
+
+/**
+ * This controller handles all actions related to Companies for
+ * the Snipe-IT Asset Management application.
+ *
+ * @version    v1.0
+ */
+
+final class CompaniesController extends Controller
+{
+
+    /**
+    * Returns view to display listing of companies.
+    *
+    * @author [Abdullah Alansari] [<ahimta@gmail.com>]
+    * @since [v1.8]
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function index()
+    {
+        return view('companies/index')->with('companies', Company::all());
+    }
+
+    /**
+    * Returns view to create a new company.
+    *
+    * @author [Abdullah Alansari] [<ahimta@gmail.com>]
+    * @since [v1.8]
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function create()
+    {
+        return view('companies/edit')->with('item', new Company);
+    }
+
+    /**
+     * 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 = $request->input('name');
+
+        if ($company->save()) {
+            return redirect()->route('companies.index')
+                ->with('success', trans('admin/companies/message.create.success'));
+        }
+        return redirect()->back()->withInput()->withErrors($company->getErrors());
+    }
+
+
+    /**
+    * Return form to edit existing company.
+    *
+    * @author [Abdullah Alansari] [<ahimta@gmail.com>]
+    * @since [v1.8]
+    * @param int $companyId
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function edit($companyId)
+    {
+        if (is_null($item = Company::find($companyId))) {
+            return redirect()->route('companies.index')
+                ->with('error', trans('admin/companies/message.does_not_exist'));
+        }
+        return view('companies/edit')->with('item', $item);
+    }
+
+    /**
+     * 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()->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'));
+    }
+
+    /**
+    * Delete company
+    *
+    * @author [Abdullah Alansari] [<ahimta@gmail.com>]
+    * @since [v1.8]
+    * @param int $companyId
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy($companyId)
+    {
+        if (is_null($company = Company::find($companyId))) {
+            return redirect()->route('companies.index')
+                ->with('error', trans('admin/companies/message.not_found'));
+        } else {
+            try {
+                $company->delete();
+                return redirect()->route('companies.index')
+                    ->with('success', 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 redirect()->route('companies.index')
+                        ->with('error', trans('admin/companies/message.assoc_users'));
+                } else {
+                    throw $exception;
+                }
+            }
+        }
+    }
+
+    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);
+        }
+
+    }
+}
@@ -0,0 +1,322 @@
+<?php
+namespace App\Http\Controllers;
+
+use App\Helpers\Helper;
+use App\Models\Company;
+use App\Models\Component;
+use App\Models\CustomField;
+use App\Models\Setting;
+use App\Models\User;
+use App\Models\Asset;
+use Auth;
+use Config;
+use DB;
+use Input;
+use Lang;
+use Mail;
+use Redirect;
+use Slack;
+use Str;
+use View;
+use Validator;
+use Illuminate\Http\Request;
+use Gate;
+
+/**
+ * This class controls all actions related to Components for
+ * the Snipe-IT Asset Management application.
+ *
+ * @version    v1.0
+ */
+class ComponentsController extends Controller
+{
+    /**
+    * Returns a view that invokes the ajax tables which actually contains
+    * the content for the components listing, which is generated in getDatatable.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see ComponentsController::getDatatable() method that generates the JSON response
+    * @since [v3.0]
+     * @return \Illuminate\Contracts\View\View
+    */
+    public function index()
+    {
+        $this->authorize('view', Component::class);
+        return view('components/index');
+    }
+
+
+    /**
+    * Returns a form to create a new component.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see ComponentsController::postCreate() method that stores the data
+    * @since [v3.0]
+    * @return \Illuminate\Contracts\View\View
+    */
+    public function create()
+    {
+        $this->authorize('create', Component::class);
+        // Show the page
+        return view('components/edit')
+            ->with('item', new Component)
+            ->with('category_list', Helper::categoryList('component'))
+            ->with('company_list', Helper::companyList())
+            ->with('location_list', Helper::locationsList());
+    }
+
+
+    /**
+    * Validate and store data for new component.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see ComponentsController::getCreate() method that generates the view
+    * @since [v3.0]
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function store()
+    {
+        $this->authorize('create', Component::class);
+        $component = new Component();
+        $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           = 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 ($component->save()) {
+            return redirect()->route('components.index')->with('success', trans('admin/components/message.create.success'));
+        }
+        return redirect()->back()->withInput()->withErrors($component->getErrors());
+    }
+
+    /**
+    * Return a view to edit a component.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see ComponentsController::postEdit() method that stores the data.
+    * @since [v3.0]
+    * @param int $componentId
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function edit($componentId = null)
+    {
+        if (is_null($item = Component::find($componentId))) {
+            return redirect()->route('components.index')->with('error', trans('admin/components/message.does_not_exist'));
+        }
+
+        $this->authorize('update', $item);
+
+        return view('components/edit', compact('item'))
+            ->with('category_list', Helper::categoryList('component'))
+            ->with('company_list', Helper::companyList())
+            ->with('location_list', Helper::locationsList());
+    }
+
+
+    /**
+    * Return a view to edit a component.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see ComponentsController::getEdit() method presents the form.
+    * @param int $componentId
+    * @since [v3.0]
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function update($componentId = null)
+    {
+        if (is_null($component = Component::find($componentId))) {
+            return redirect()->route('components.index')->with('error', trans('admin/components/message.does_not_exist'));
+        }
+
+        $this->authorize('update', $component);
+
+
+        // Update the component data
+        $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           = 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 ($component->save()) {
+            return redirect()->route('components.index')->with('success', trans('admin/components/message.update.success'));
+        }
+        return redirect()->back()->withInput()->withErrors($component->getErrors());
+    }
+
+    /**
+    * Delete a component.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v3.0]
+    * @param int $componentId
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy($componentId)
+    {
+        if (is_null($component = Component::find($componentId))) {
+            return redirect()->route('components.index')->with('error', trans('admin/components/message.not_found'));
+        }
+
+        $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';
+    }
+
+
+    /**
+    * Return a view to display component information.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see ComponentsController::getDataView() method that generates the JSON response
+    * @since [v3.0]
+    * @param int $componentId
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function show($componentId = null)
+    {
+        $component = Component::find($componentId);
+
+        if (isset($component->id)) {
+            $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);
+    }
+
+    /**
+    * Returns a view that allows the checkout of a component to an asset.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see ComponentsController::postCheckout() method that stores the data.
+    * @since [v3.0]
+    * @param int $componentId
+    * @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()->route('components.index')->with('error', trans('admin/components/message.not_found'));
+        }
+        $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 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()->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(), [
+            "asset_id"          => "required",
+            "assigned_qty"      => "required|numeric|between:1,$max_to_checkout"
+        ]);
+
+        if ($validator->fails()) {
+            return redirect()->back()
+                ->withErrors($validator)
+                ->withInput();
+        }
+
+        $admin_user = Auth::user();
+        $asset_id = e(Input::get('asset_id'));
+
+      // Check if the user exists
+        if (is_null($asset = Asset::find($asset_id))) {
+            // Redirect to the component management page with error
+            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, [
+            '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);
+        return redirect()->route('components.index')->with('success', trans('admin/components/message.checkout.success'));
+    }
+
+
+    /**
+    * Return JSON data to populate the components view,
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see ComponentsController::getView() method that returns the view.
+    * @since [v3.0]
+    * @param int $componentId
+    * @return string JSON
+    */
+    public function getDataView($componentId)
+    {
+        if (is_null($component = Component::with('assets')->find($componentId))) {
+            // Redirect to the component management page with error
+            return redirect()->route('components.index')->with('error', trans('admin/components/message.not_found'));
+        }
+
+        if (!Company::isCurrentUserHasAccess($component)) {
+            return ['total' => 0, 'rows' => []];
+        }
+        $this->authorize('view', $component);
+
+        $rows = array();
+        $all_custom_fields = CustomField::all(); // Cached for table;
+        foreach ($component->assets as $component_assignment) {
+            $rows[] = $component_assignment->present()->forDataTable($all_custom_fields);
+        }
+
+        $componentCount = $component->assets->count();
+        $data = array('total' => $componentCount, 'rows' => $rows);
+        return $data;
+    }
+}
@@ -0,0 +1,276 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Helpers\Helper;
+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;
+use Input;
+use Lang;
+use Mail;
+use Redirect;
+use Slack;
+use Str;
+use View;
+use Gate;
+
+/**
+ * This controller handles all actions related to Consumables for
+ * the Snipe-IT Asset Management application.
+ *
+ * @version    v1.0
+ */
+class ConsumablesController extends Controller
+{
+    /**
+    * Return a view to display component information.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see ConsumablesController::getDatatable() method that generates the JSON response
+    * @since [v1.0]
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function index()
+    {
+        $this->authorize('index', Consumable::class);
+        return view('consumables/index');
+    }
+
+
+    /**
+    * Return a view to display the form view to create a new consumable
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see ConsumablesController::postCreate() method that stores the form data
+    * @since [v1.0]
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function create()
+    {
+        $this->authorize('create', Consumable::class);
+        // Show the page
+        return view('consumables/edit')
+            ->with('item', new Consumable)
+            ->with('category_list', Helper::categoryList('consumable'))
+            ->with('company_list', Helper::companyList())
+            ->with('location_list', Helper::locationsList())
+            ->with('manufacturer_list', Helper::manufacturerList());
+    }
+
+
+    /**
+    * Validate and store new consumable data.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see ConsumablesController::getCreate() method that returns the form view
+    * @since [v1.0]
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function store()
+    {
+        $this->authorize('create', Consumable::class);
+        $consumable = new 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           = 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 ($consumable->save()) {
+            return redirect()->route('consumables.index')->with('success', trans('admin/consumables/message.create.success'));
+        }
+
+        return redirect()->back()->withInput()->withErrors($consumable->getErrors());
+
+    }
+
+    /**
+    * Returns a form view to edit a consumable.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @param  int $consumableId
+    * @see ConsumablesController::postEdit() method that stores the form data.
+    * @since [v1.0]
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function edit($consumableId = null)
+    {
+        if (is_null($item = Consumable::find($consumableId))) {
+            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist'));
+        }
+
+        $this->authorize($item);
+
+        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());
+    }
+
+
+    /**
+    * Returns a form view to edit a consumable.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @param  int $consumableId
+    * @see ConsumablesController::getEdit() method that stores the form data.
+    * @since [v1.0]
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function update($consumableId = null)
+    {
+        if (is_null($consumable = Consumable::find($consumableId))) {
+            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist'));
+        }
+
+        $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           = 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()->route('consumables.index')->with('success', trans('admin/consumables/message.update.success'));
+        }
+        return redirect()->back()->withInput()->withErrors($consumable->getErrors());
+    }
+
+    /**
+    * Delete a consumable.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @param  int $consumableId
+    * @since [v1.0]
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy($consumableId)
+    {
+        if (is_null($consumable = Consumable::find($consumableId))) {
+            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.not_found'));
+        }
+        $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.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see ConsumablesController::getDataView() method that generates the JSON response
+    * @since [v1.0]
+    * @param int $consumableId
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function show($consumableId = null)
+    {
+        $consumable = Consumable::find($consumableId);
+        $this->authorize($consumable);
+        if (isset($consumable->id)) {
+            return view('consumables/view', compact('consumable'));
+        }
+        return redirect()->route('consumables')->with('error', trans('admin/consumables/message.does_not_exist', compact('id')));
+    }
+
+    /**
+    * Return a view to checkout a consumable to a user.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see ConsumablesController::postCheckout() method that stores the data.
+    * @since [v1.0]
+    * @param int $consumableId
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function getCheckout($consumableId)
+    {
+        if (is_null($consumable = Consumable::find($consumableId))) {
+            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.not_found'));
+        }
+        $this->authorize('checkout', $consumable);
+        return view('consumables/checkout', compact('consumable'))->with('users_list', Helper::usersList());
+    }
+
+    /**
+    * Saves the checkout information
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see ConsumablesController::getCheckout() method that returns the form.
+    * @since [v1.0]
+    * @param int $consumableId
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function postCheckout($consumableId)
+    {
+        if (is_null($consumable = Consumable::find($consumableId))) {
+            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
+        if (is_null($user = User::find($assigned_to))) {
+            // Redirect to the consumable management page with error
+            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.user_does_not_exist'));
+        }
+
+        // Update the consumable data
+        $consumable->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')), $user);
+        $data['log_id'] = $logaction->id;
+        $data['eula'] = $consumable->getEula();
+        $data['first_name'] = $user->first_name;
+        $data['item_name'] = $consumable->name;
+        $data['checkout_date'] = $logaction->created_at;
+        $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) {
+                $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_consumable_delivery'));
+            });
+        }
+
+      // Redirect to the new consumable page
+        return redirect()->route('consumables.index')->with('success', trans('admin/consumables/message.checkout.success'));
+
+    }
+
+}
@@ -0,0 +1,39 @@
+<?php
+/*! \mainpage Snipe-IT Code Documentation
+ *
+ * \section intro_sec Introduction
+ *
+ * This documentation is designed to allow developers to easily understand
+ * the backend code of Snipe-IT. Familiarity with the PHP language is assumed,
+ * and experience with the Laravel framework (version 5.2) will be very helpful.
+ *
+ * **THIS DOCUMENTATION DOES NOT COVER INSTALLATION.** If you're here and you're not a
+ * developer, you're probably in the wrong place. Please see the
+ * [Installation documentation](http://docs.snipeitapp.com) for
+ * information on how to install Snipe-IT.
+ *
+ * To learn how to set up a development environment and get started developing for Snipe-IT,
+ * please see the [contributing documentation](http://docs.snipeitapp.com/contributing.html).
+ *
+ * Only the Snipe-IT specific controllers, models, helpers, service providers,
+ * etc have been included in this documentation (excluding vendors, Laravel core, etc)
+ * for simplicity.
+ */
+namespace App\Http\Controllers;
+
+use Auth;
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+
+abstract class Controller extends BaseController
+{
+    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+
+    public function __construct()
+    {
+        view()->share('signedIn', Auth::check());
+        view()->share('user', Auth::user());
+    }
+}
@@ -0,0 +1,200 @@
+<?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 App\Helpers\Helper;
+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 CustomFieldsController extends Controller
+{
+
+    /**
+    * Returns a view with a listing of custom fields.
+    *
+    * @author [Brady Wetherington] [<uberbrady@gmail.com>]
+    * @since [v1.8]
+    * @return View
+    */
+    public function index()
+    {
+
+        $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 to create a new custom field.
+    *
+    * @see CustomFieldsController::storeField()
+    * @author [Brady Wetherington] [<uberbrady@gmail.com>]
+    * @since [v1.8]
+    * @return View
+    */
+    public function create()
+    {
+
+        return view("custom_fields.fields.edit")->with('field', new CustomField());
+    }
+
+
+    /**
+    * Validates and stores a new custom field.
+    *
+    * @see CustomFieldsController::createField()
+    * @author [Brady Wetherington] [<uberbrady@gmail.com>]
+    * @since [v1.8]
+    * @return Redirect
+    */
+    public function store(Request $request)
+    {
+        $field = new CustomField([
+            "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
+        ]);
+
+
+
+        if (!in_array(Input::get('format'), array_keys(CustomField::$PredefinedFormats))) {
+            $field->format = e($request->get("custom_format"));
+        } else {
+            $field->format = e($request->get("format"));
+        }
+
+
+        $validator = Validator::make(Input::all(), $field->rules);
+
+        if ($validator->passes()) {
+            $results = $field->save();
+            if ($results) {
+                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'));
+            }
+        } else {
+            return redirect()->back()->withInput()->withErrors($validator);
+        }
+    }
+
+
+    /**
+     * Detach a custom field from a fieldset.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.0]
+     * @return Redirect
+     */
+    public function deleteFieldFromFieldset($field_id, $fieldset_id)
+    {
+        $field = CustomField::find($field_id);
+
+        if ($field->fieldset()->detach($fieldset_id)) {
+            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"]);
+    }
+
+    /**
+    * 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 redirect()->back()->withErrors(['message' => "Field is in-use"]);
+        } else {
+            $field->delete();
+            return redirect()->route("fields.index")->with("success", trans('admin/custom_fields/message.field.delete.success'));
+        }
+    }
+
+
+
+    /**
+    * Return a view to edit a custom field
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @param  int  $id
+    * @since [v4.0]
+    * @return View
+    */
+    public function edit($id)
+    {
+        $field = CustomField::find($id);
+        return view("custom_fields.fields.edit")->with('field', $field);
+    }
+
+
+    /**
+    * Store the updated field
+    *
+    * @todo Allow encrypting/decrypting if encryption status changes
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @param  int  $id
+    * @since [v4.0]
+    * @return Redirect
+    */
+    public function update(Request $request, $id)
+    {
+        $field =  CustomField::find($id);
+
+        $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 {
+            $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);
+    }
+
+
+
+}
@@ -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'));
+    }
+}
@@ -0,0 +1,52 @@
+<?php
+namespace App\Http\Controllers;
+
+use App\Http\Controllers\AdminController;
+use App\Models\Actionlog;
+use View;
+use Auth;
+use Redirect;
+use App\Models\Asset;
+use App\Models\Company;
+
+/**
+ * This controller handles all actions related to the Admin Dashboard
+ * for the Snipe-IT Asset Management application.
+ *
+ * @version    v1.0
+ */
+class DashboardController extends Controller
+{
+    /**
+    * Check authorization and display admin dashboard, otherwise display
+    * the user's checked-out assets.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @return View
+    */
+    public function getIndex()
+    {
+        // Show the page
+        if (Auth::user()->hasAccess('admin')) {
+
+            $asset_stats=null;
+
+            $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 ((!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('dashboard')->with('asset_stats', $asset_stats)->with('counts', $counts);
+        } else {
+        // Redirect to the profile page
+            return redirect()->intended('account/view-assets');
+        }
+    }
+}
@@ -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());
+    }
+    
+
+}
@@ -0,0 +1,159 @@
+<?php
+namespace App\Http\Controllers;
+
+use App\Helpers\Helper;
+use Lang;
+use App\Models\Depreciation;
+use Redirect;
+use App\Models\Setting;
+use DB;
+use Str;
+use View;
+use Auth;
+use Illuminate\Http\Request;
+
+/**
+ * This controller handles all actions related to Depreciations for
+ * the Snipe-IT Asset Management application.
+ *
+ * @version    v1.0
+ */
+class DepreciationsController extends Controller
+{
+    /**
+    * Returns a view that invokes the ajax tables which actually contains
+    * the content for the depreciation listing, which is generated in getDatatable.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net]
+    * @see DepreciationsController::getDatatable() method that generates the JSON response
+    * @since [v1.0]
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function index()
+    {
+        // Show the page
+        return view('depreciations/index', compact('depreciations'));
+    }
+
+
+    /**
+    * Returns a view that displays a form to create a new depreciation.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net]
+    * @see DepreciationsController::postCreate()
+    * @since [v1.0]
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function create()
+    {
+        // Show the page
+        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]
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function store(Request $request)
+    {
+        // create a new instance
+        $depreciation = new Depreciation();
+        // Depreciation data
+        $depreciation->name             = $request->input('name');
+        $depreciation->months           = $request->input('months');
+        $depreciation->user_id          = Auth::id();
+
+        // Was the asset created?
+        if ($depreciation->save()) {
+            // Redirect to the new depreciation  page
+            return redirect()->route('depreciations.index')->with('success', trans('admin/depreciations/message.create.success'));
+        }
+        return redirect()->back()->withInput()->withErrors($depreciation->getErrors());
+    }
+
+    /**
+    * Returns a view that displays a form to update a depreciation.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net]
+    * @see DepreciationsController::postEdit()
+    * @param int $depreciationId
+    * @since [v1.0]
+    * @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()->route('depreciations.index')->with('error', trans('admin/depreciations/message.does_not_exist'));
+        }
+
+        return view('depreciations/edit', compact('item'));
+    }
+
+
+    /**
+     * 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()->route('depreciations.index')->with('error', trans('admin/depreciations/message.does_not_exist'));
+        }
+
+        // Depreciation data
+        $depreciation->name      = $request->input('name');
+        $depreciation->months    = $request->input('months');
+
+        // Was the asset created?
+        if ($depreciation->save()) {
+            // Redirect to the depreciation page
+            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]
+     * @param integer $depreciationId
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy($depreciationId)
+    {
+        // Check if the depreciation exists
+        if (is_null($depreciation = Depreciation::find($depreciationId))) {
+            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()->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'));
+    }
+
+
+}
@@ -0,0 +1,145 @@
+<?php
+namespace App\Http\Controllers;
+
+use Config;
+use Input;
+use Lang;
+use Redirect;
+use App\Models\Setting;
+use Validator;
+use View;
+use App\Models\Group;
+use App\Helpers\Helper;
+
+/**
+ * This controller handles all actions related to User Groups for
+ * the Snipe-IT Asset Management application.
+ *
+ * @version    v1.0
+ */
+class GroupsController extends Controller
+{
+    /**
+    * Returns a view that invokes the ajax tables which actually contains
+    * the content for the user group listing, which is generated in getDatatable.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net]
+    * @see GroupsController::getDatatable() method that generates the JSON response
+    * @since [v1.0]
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function index()
+    {
+        // Show the page
+        return view('groups/index', compact('groups'));
+    }
+
+    /**
+    * Returns a view that displays a form to create a new User Group.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net]
+    * @see GroupsController::postCreate()
+    * @since [v1.0]
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function create()
+    {
+        $group = new Group;
+        // Get all the available permissions
+        $permissions = config('permissions');
+        $groupPermissions = array();
+        $selectedPermissions = Input::old('permissions', $groupPermissions);
+
+        // Show the page
+        return view('groups/edit', compact('permissions', 'selectedPermissions', 'groupPermissions'))->with('group', $group);
+    }
+
+    /**
+    * Validates and stores the new User Group data.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net]
+    * @see GroupsController::getCreate()
+    * @since [v1.0]
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function store()
+    {
+        // create a new group instance
+        $group = new Group();
+        $group->name = e(Input::get('name'));
+        $group->permissions = json_encode(Input::get('permission'));
+
+        if ($group->save()) {
+            return redirect()->route("groups.index")->with('success', trans('admin/groups/message.success.create'));
+        }
+        return redirect(route('groups.create'))->withInput()->withErrors($group->getErrors());
+    }
+
+    /**
+    * Returns a view that presents a form to edit a User Group.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net]
+    * @see GroupsController::postEdit()
+    * @param int $id
+    * @since [v1.0]
+    * @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('groups.edit', compact('group', 'permissions', 'selected_array', 'groupPermissions'));
+    }
+
+    /**
+    * Validates and stores the updated User Group data.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net]
+    * @see GroupsController::getEdit()
+    * @param int $id
+    * @since [v1.0]
+    * @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()->route('groups.index')->with('success', trans('admin/groups/message.success.update'));
+            }
+            return redirect()->back()->withInput()->withErrors($group->getErrors());
+        }
+        return redirect()->route('groups.index')->with('error', trans('general.feature_disabled'));
+    }
+
+    /**
+    * Validates and deletes the User Group.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net]
+    * @see GroupsController::getEdit()
+    * @param int $id
+    * @since [v1.0]
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy($id = null)
+    {
+        if (!config('app.lock_passwords')) {
+            if (!$group = Group::find($id)) {
+                return redirect()->route('groups')->with('error', trans('admin/groups/message.group_not_found', compact('id')));
+            }
+            $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'));
+    }
+
+}
@@ -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);
+    }
+}
@@ -0,0 +1,670 @@
+<?php
+namespace App\Http\Controllers;
+
+use Assets;
+use Illuminate\Support\Facades\Session;
+use Input;
+use Lang;
+use App\Models\License;
+use App\Models\Asset;
+use App\Models\User;
+use App\Models\Actionlog;
+use DB;
+use App\Models\LicenseSeat;
+use App\Models\Company;
+use Validator;
+use View;
+use Response;
+use Slack;
+use Config;
+use App\Helpers\Helper;
+use Auth;
+use Gate;
+use Illuminate\Http\Request;
+
+/**
+ * This controller handles all actions related to Licenses for
+ * the Snipe-IT Asset Management application.
+ *
+ * @version    v1.0
+ */
+class LicensesController extends Controller
+{
+
+    /**
+    * Returns a view that invokes the ajax tables which actually contains
+    * the content for the licenses listing, which is generated in getDatatable.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see LicensesController::getDatatable() method that generates the JSON response
+    * @since [v1.0]
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function index()
+    {
+        $this->authorize('view', License::class);
+        return view('licenses/index');
+    }
+
+
+    /**
+    * Returns a form view that allows an admin to create a new licence.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see AccessoriesController::getDatatable() method that generates the JSON response
+    * @since [v1.0]
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function create()
+    {
+        $this->authorize('create', License::class);
+        $maintained_list = [
+            '' => 'Maintained',
+            '1' => 'Yes',
+            '0' => 'No'
+        ];
+
+        return view('licenses/edit')
+            //->with('license_options',$license_options)
+            ->with('depreciation_list', Helper::depreciationList())
+            ->with('supplier_list', Helper::suppliersList())
+            ->with('maintained_list', $maintained_list)
+            ->with('company_list', Helper::companyList())
+            ->with('manufacturer_list', Helper::manufacturerList())
+            ->with('item', new License);
+
+    }
+
+
+    /**
+     * Validates and stores the license form data submitted from the new
+     * license form.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @see LicensesController::getCreate() method that provides the form view
+     * @since [v1.0]
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function store(Request $request)
+    {
+        $this->authorize('create', License::class);
+        // create a new model instance
+        $license = new License();
+        // Save the license data
+        $license->company_id        = Company::getIdForCurrentUser($request->input('company_id'));
+        $license->depreciation_id   = $request->input('depreciation_id');
+        $license->expiration_date   = $request->input('expiration_date');
+        $license->license_email     = $request->input('license_email');
+        $license->license_name      = $request->input('license_name');
+        $license->maintained        = $request->input('maintained', 0);
+        $license->manufacturer_id   = $request->input('manufacturer_id');
+        $license->name              = $request->input('name');
+        $license->notes             = $request->input('notes');
+        $license->order_number      = $request->input('order_number');
+        $license->purchase_cost     = $request->input('purchase_cost');
+        $license->purchase_date     = $request->input('purchase_date');
+        $license->purchase_order    = $request->input('purchase_order');
+        $license->purchase_order    = $request->input('purchase_order');
+        $license->reassignable      = $request->input('reassignable', 0);
+        $license->seats             = $request->input('seats');
+        $license->serial            = $request->input('serial');
+        $license->supplier_id       = $request->input('supplier_id');
+        $license->termination_date  = $request->input('termination_date');
+        $license->user_id           = Auth::id();
+
+        if ($license->save()) {
+            return redirect()->route("licenses.index")->with('success', trans('admin/licenses/message.create.success'));
+        }
+        return redirect()->back()->withInput()->withErrors($license->getErrors());
+    }
+
+    /**
+    * Returns a form with existing license data to allow an admin to
+    * update license information.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @param int $licenseId
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function edit($licenseId = null)
+    {
+        if (is_null($item = License::find($licenseId))) {
+            return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist'));
+        }
+
+        $this->authorize('update', $item);
+
+        $maintained_list = [
+            '' => 'Maintained',
+            '1' => 'Yes',
+            '0' => 'No'
+        ];
+
+        return view('licenses/edit', compact('item'))
+            ->with('depreciation_list', Helper::depreciationList())
+            ->with('supplier_list', Helper::suppliersList())
+            ->with('company_list', Helper::companyList())
+            ->with('maintained_list', $maintained_list)
+            ->with('manufacturer_list', Helper::manufacturerList());
+    }
+
+
+    /**
+     * Validates and stores the license form data submitted from the edit
+     * license form.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @see LicensesController::getEdit() method that provides the form view
+     * @since [v1.0]
+     * @param Request $request
+     * @param int $licenseId
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function update(Request $request, $licenseId = null)
+    {
+        if (is_null($license = License::find($licenseId))) {
+            return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist'));
+        }
+
+        $this->authorize('update', $license);
+
+        $license->company_id        = Company::getIdForCurrentUser($request->input('company_id'));
+        $license->depreciation_id   = $request->input('depreciation_id');
+        $license->expiration_date   = $request->input('expiration_date');
+        $license->license_email     = $request->input('license_email');
+        $license->license_name      = $request->input('license_name');
+        $license->maintained        = $request->input('maintained',0);
+        $license->name              = $request->input('name');
+        $license->notes             = $request->input('notes');
+        $license->order_number      = $request->input('order_number');
+        $license->purchase_cost     = $request->input('purchase_cost');
+        $license->purchase_date     = $request->input('purchase_date');
+        $license->purchase_order    = $request->input('purchase_order');
+        $license->reassignable      = $request->input('reassignable', 0);
+        $license->serial            = $request->input('serial');
+        $license->termination_date  = $request->input('termination_date');
+        $license->seats             = e($request->input('seats'));
+        $license->manufacturer_id   =  $request->input('manufacturer_id');
+
+        if ($license->save()) {
+            return redirect()->route('licenses.show', ['license' => $licenseId])->with('success', trans('admin/licenses/message.update.success'));
+        }
+        // If we can't adjust the number of seats, the error is flashed to the session by the event handler in License.php
+        return redirect()->back()->withInput()->withErrors($license->getErrors());
+    }
+
+    /**
+    * Checks to see whether the selected license can be deleted, and
+    * if it can, marks it as deleted.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @param int $licenseId
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy($licenseId)
+    {
+        // Check if the license exists
+        if (is_null($license = License::find($licenseId))) {
+            // Redirect to the license management page
+            return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.not_found'));
+        }
+
+        $this->authorize('delete', $license);
+
+        if ($license->assigned_seats_count == 0) {
+            // Delete the license and the associated license seats
+            DB::table('license_seats')
+                ->where('id', $license->id)
+                ->update(array('assigned_to' => null,'asset_id' => null));
+
+            $licenseSeats = $license->licenseseats();
+            $licenseSeats->delete();
+            $license->delete();
+
+            // Redirect to the licenses management page
+            return redirect()->route('licenses.index')->with('success', trans('admin/licenses/message.delete.success'));
+            // Redirect to the license management page
+        }
+        // There are still licenses in use.
+        return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.assoc_users'));
+
+    }
+
+    /**
+    * Provides the form view for checking out a license to a user.
+    * Here we pass the license seat ID instead of the license ID,
+    * because licenses themselves are never checked out to anyone,
+    * only the seats associated with them.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @param int $seatId
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function getCheckout($seatId)
+    {
+        // Check if the license seat exists
+        if (is_null($licenseSeat = LicenseSeat::find($seatId))) {
+            // Redirect to the asset management page with error
+            return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.not_found'));
+        }
+
+        $this->authorize('checkout', $licenseSeat);
+        return view('licenses/checkout', compact('licenseSeat'))
+            ->with('users_list', Helper::usersList())
+            ->with('asset_list', Helper::detailedAssetList());
+    }
+
+
+    /**
+     * Validates and stores the license checkout action.
+     *
+     * @todo Switch to using a FormRequest for validation here.
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @param Request $request
+     * @param int $seatId
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function postCheckout(Request $request, $seatId)
+    {
+        $licenseSeat = LicenseSeat::find($seatId);
+        $assigned_to = e($request->input('assigned_to'));
+        $asset_id = e($request->input('asset_id'));
+
+        $this->authorize('checkout', $licenseSeat);
+
+        // Declare the rules for the form validation
+        $rules = [
+            'note'   => 'string',
+            'asset_id'  => 'required_without:assigned_to',
+        ];
+
+        // Create a new validator instance from our validation rules
+        $validator = Validator::make(Input::all(), $rules);
+
+        // If validation fails, we'll exit the operation now.
+        if ($validator->fails()) {
+            // Ooops.. something went wrong
+            return redirect()->back()->withInput()->withErrors($validator);
+        }
+        $target = null;
+        if ($assigned_to!='') {
+        // Check if the user exists
+            if (is_null($target = User::find($assigned_to))) {
+                // Redirect to the asset management page with error
+                return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.user_does_not_exist'));
+            }
+        }
+
+        if ($asset_id!='') {
+            if (is_null($target = Asset::find($asset_id))) {
+                // Redirect to the asset management page with error
+                return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.asset_does_not_exist'));
+            }
+
+            if (($request->has('assigned_to')) && ($request->has('asset_id'))) {
+                return redirect()->back()->withInput()->with('error', trans('admin/licenses/message.select_asset_or_person'));
+            }
+        }
+
+        // Check if the asset exists
+        if (is_null($licenseSeat)) {
+            // Redirect to the asset management page with error
+            return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.not_found'));
+        }
+
+        if ($request->input('asset_id') == '') {
+            $licenseSeat->asset_id = null;
+        } else {
+            $licenseSeat->asset_id = $request->input('asset_id');
+        }
+
+        // Update the asset data
+        if ($request->input('assigned_to') == '') {
+                $licenseSeat->assigned_to =  null;
+        } else {
+                $licenseSeat->assigned_to = $request->input('assigned_to');
+        }
+
+        // Was the asset updated?
+        if ($licenseSeat->save()) {
+            $licenseSeat->logCheckout($request->input('note'), $target);
+
+            $data['license_id'] =$licenseSeat->license_id;
+            $data['note'] = $request->input('note');
+
+            // Redirect to the new asset page
+            return redirect()->route("licenses.index")->with('success', trans('admin/licenses/message.checkout.success'));
+        }
+
+        // Redirect to the asset management page with error
+        return redirect()->to("admin/licenses/{$asset_id}/checkout")->with('error', trans('admin/licenses/message.create.error'))->with('license', new License);
+    }
+
+
+    /**
+    * Makes the form view to check a license seat back into inventory.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @param int $seatId
+    * @param string $backTo
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function getCheckin($seatId = null, $backTo = null)
+    {
+        // Check if the asset exists
+        if (is_null($licenseseat = LicenseSeat::find($seatId))) {
+            // Redirect to the asset management page with error
+            return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.not_found'));
+        }
+        $this->authorize('checkin', $licenseseat);
+        return view('licenses/checkin', compact('licenseseat'))->with('backto', $backTo);
+    }
+
+
+    /**
+    * Validates and stores the license checkin action.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see LicensesController::getCheckin() method that provides the form view
+    * @since [v1.0]
+    * @param int $seatId
+    * @param string $backTo
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function postCheckin($seatId = null, $backTo = null)
+    {
+        // Check if the asset exists
+        if (is_null($licenseSeat = LicenseSeat::find($seatId))) {
+            // Redirect to the asset management page with error
+            return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.not_found'));
+        }
+
+        $license = License::find($licenseSeat->license_id);
+
+        $this->authorize('checkin', $licenseSeat);
+
+        if (!$license->reassignable) {
+            // Not allowed to checkin
+            Session::flash('error', 'License not reassignable.');
+            return redirect()->back()->withInput();
+        }
+
+        // Declare the rules for the form validation
+        $rules = array(
+            'note'   => 'string',
+            'notes'   => 'string',
+        );
+
+        // Create a new validator instance from our validation rules
+        $validator = Validator::make(Input::all(), $rules);
+
+        // If validation fails, we'll exit the operation now.
+        if ($validator->fails()) {
+            // Ooops.. something went wrong
+            return redirect()->back()->withInput()->withErrors($validator);
+        }
+        $return_to = User::find($licenseSeat->assigned_to);
+        if (!$return_to) {
+            $return_to = Asset::find($licenseSeat->asset_id);
+        }
+        // Update the asset data
+        $licenseSeat->assigned_to                   = null;
+        $licenseSeat->asset_id                      = null;
+
+        // Was the asset updated?
+        if ($licenseSeat->save()) {
+            $licenseSeat->logCheckin($return_to, e(request('note')));
+            if ($backTo=='user') {
+                return redirect()->route("users.show", $return_to->id)->with('success', trans('admin/licenses/message.checkin.success'));
+            }
+            return redirect()->route("licenses.show", $licenseSeat->license_id)->with('success', trans('admin/licenses/message.checkin.success'));
+        }
+
+        // Redirect to the license page with error
+        return redirect()->route("licenses.index")->with('error', trans('admin/licenses/message.checkin.error'));
+    }
+
+    /**
+    * Makes the license detail page.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @param int $licenseId
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function show($licenseId = null)
+    {
+
+        $license = License::find($licenseId);
+        $license = $license->load('assignedusers', 'licenseSeats.user', 'licenseSeats.asset');
+
+        if (isset($license->id)) {
+            $license = $license->load('assignedusers', 'licenseSeats.user', 'licenseSeats.asset');
+            $this->authorize('view', $license);
+            return view('licenses/view', compact('license'));
+        }
+        $error = trans('admin/licenses/message.does_not_exist', compact('id'));
+        return redirect()->route('licenses.index')->with('error', $error);
+    }
+
+    public function getClone($licenseId = null)
+    {
+        if (is_null($license_to_clone = License::find($licenseId))) {
+            return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist'));
+        }
+
+        $this->authorize('create', License::class);
+
+        $maintained_list = [
+            '' => 'Maintained',
+            '1' => 'Yes',
+            '0' => 'No'
+        ];
+        //clone the orig
+        $license = clone $license_to_clone;
+        $license->id = null;
+        $license->serial = null;
+
+        // Show the page
+        return view('licenses/edit')
+        ->with('depreciation_list', Helper::depreciationList())
+        ->with('supplier_list', Helper::suppliersList())
+        ->with('item', $license)
+        ->with('maintained_list', $maintained_list)
+        ->with('company_list', Helper::companyList())
+        ->with('manufacturer_list', Helper::manufacturerList());
+    }
+
+
+    /**
+    * Validates and stores files associated with a license.
+    *
+    * @todo Switch to using the AssetFileRequest form request validator.
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @param int $licenseId
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function postUpload($licenseId = null)
+    {
+        $license = License::find($licenseId);
+        // the license is valid
+        $destinationPath = config('app.private_uploads').'/licenses';
+
+        if (isset($license->id)) {
+            $this->authorize('update', $license);
+
+            if (Input::hasFile('licensefile')) {
+
+                foreach (Input::file('licensefile') as $file) {
+
+                    $rules = array(
+                    'licensefile' => 'required|mimes:png,gif,jpg,jpeg,doc,docx,pdf,txt,zip,rar,rtf,xml,lic|max:2000'
+                    );
+                    $validator = Validator::make(array('licensefile'=> $file), $rules);
+
+                    if ($validator->fails()) {
+                         return redirect()->back()->with('error', trans('admin/licenses/message.upload.invalidfiles'));
+                    }
+                    $extension = $file->getClientOriginalExtension();
+                    $filename = 'license-'.$license->id.'-'.str_random(8);
+                    $filename .= '-'.str_slug($file->getClientOriginalName()).'.'.$extension;
+                    $upload_success = $file->move($destinationPath, $filename);
+
+                    //Log the upload to the log
+                    $license->logUpload($filename, e($request->input('notes')));
+                }
+
+                if ($upload_success) {
+                    return redirect()->back()->with('success', trans('admin/licenses/message.upload.success'));
+                }
+                return redirect()->back()->with('error', trans('admin/licenses/message.upload.error'));
+            }
+            return redirect()->back()->with('error', trans('admin/licenses/message.upload.nofiles'));
+        }
+        // Prepare the error message
+        $error = trans('admin/licenses/message.does_not_exist', compact('id'));
+        return redirect()->route('licenses.index')->with('error', $error);
+    }
+
+
+    /**
+    * Deletes the selected license file.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @param int $licenseId
+    * @param int $fileId
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function getDeleteFile($licenseId = null, $fileId = null)
+    {
+        $license = License::find($licenseId);
+        $destinationPath = config('app.private_uploads').'/licenses';
+
+        // the license is valid
+        if (isset($license->id)) {
+            $this->authorize('edit', $license);
+            $log = Actionlog::find($fileId);
+            $full_filename = $destinationPath.'/'.$log->filename;
+            if (file_exists($full_filename)) {
+                unlink($destinationPath.'/'.$log->filename);
+            }
+            $log->delete();
+            return redirect()->back()->with('success', trans('admin/licenses/message.deletefile.success'));
+        }
+        // Prepare the error message
+        $error = trans('admin/licenses/message.does_not_exist', compact('id'));
+
+        // Redirect to the licence management page
+        return redirect()->route('licenses.index')->with('error', $error);
+    }
+
+
+
+    /**
+    * Allows the selected file to be viewed.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.4]
+    * @param int $licenseId
+    * @param int $fileId
+    * @return \Symfony\Component\HttpFoundation\BinaryFileResponse
+     */
+    public function displayFile($licenseId = null, $fileId = null)
+    {
+
+        $license = License::find($licenseId);
+
+        // the license is valid
+        if (isset($license->id)) {
+            $this->authorize('view', $license);
+            $log = Actionlog::find($fileId);
+            $file = $log->get_src('licenses');
+            return Response::download($file);
+        }
+        // Prepare the error message
+        $error = trans('admin/licenses/message.does_not_exist', compact('id'));
+        // Redirect to the licence management page
+        return redirect()->route('licenses.index')->with('error', $error);
+    }
+
+
+    /**
+    * Generates a JSON response to populate the licence index datatables.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see LicensesController::getIndex() method that provides the view
+    * @since [v1.0]
+    * @return String JSON
+    */
+    public function getDatatable(Request $request)
+    {
+        $this->authorize('view', License::class);
+        $licenses = Company::scopeCompanyables(License::with('company', 'licenseSeatsRelation', 'manufacturer'));
+
+        if (Input::has('search')) {
+            $licenses = $licenses->TextSearch($request->input('search'));
+        }
+        $offset = request('offset', 0);
+        $limit = request('limit', 50);
+
+        $allowed_columns = ['id','name','purchase_cost','expiration_date','purchase_order','order_number','notes','purchase_date','serial','manufacturer','company'];
+        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';
+
+        switch ($sort) {
+            case 'manufacturer':
+                $licenses = $licenses->OrderManufacturer($order);
+                break;
+            case 'company':
+                $licenses = $licenses->OrderCompany($order);
+                break;
+            default:
+                $licenses = $licenses->orderBy($sort, $order);
+                break;
+        }
+
+        $licenseCount = $licenses->count();
+        $licenses = $licenses->skip($offset)->take($limit)->get();
+
+        $rows = array();
+
+        foreach ($licenses as $license) {
+            $rows[] = $license->present()->forDataTable();
+        }
+
+        $data = array('total' => $licenseCount, 'rows' => $rows);
+
+        return $data;
+    }
+
+    /**
+    * Generates the next free seat ID for checkout.
+    *
+    * @todo This is a dumb way to solve this problem.
+    * Author should refactor. And go hide in a hole and
+    * think about what she's done. And perhaps find a new
+    * line of work. And get in the sea.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @param int $licenseId
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function getFreeLicense($licenseId)
+    {
+        $this->authorize('checkout', License::class);
+        if (is_null($license = License::find($licenseId))) {
+            return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.not_found'));
+        }
+        $seatId = $license->freeSeat($licenseId);
+        return redirect()->route('licenses.checkout', $seatId);
+    }
+}
@@ -0,0 +1,259 @@
+<?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;
+use App\Models\Asset;
+use DB;
+use Str;
+use Validator;
+use View;
+use Auth;
+use Symfony\Component\HttpFoundation\JsonResponse;
+
+/**
+ * This controller handles all actions related to Locations for
+ * the Snipe-IT Asset Management application.
+ *
+ * @version    v1.0
+ */
+class LocationsController extends Controller
+{
+
+    /**
+    * Returns a view that invokes the ajax tables which actually contains
+    * the content for the locations listing, which is generated in getDatatable.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see LocationsController::getDatatable() method that generates the JSON response
+    * @since [v1.0]
+    * @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('locations/index', compact('locations'));
+    }
+
+
+    /**
+    * Returns a form view used to create a new location.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see LocationsController::postCreate() method that validates and stores the data
+    * @since [v1.0]
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function create()
+    {
+        $locations = Location::orderBy('name', 'ASC')->get();
+
+        $location_options_array = Location::getLocationHierarchy($locations);
+        $location_options = Location::flattenLocationsArray($location_options_array);
+        $location_options = array('' => 'Top Level') + $location_options;
+
+        return view('locations/edit')
+            ->with('location_options', $location_options)
+            ->with('item', new Location)
+            ->with('manager_list', Helper::managerList());
+    }
+
+
+    /**
+    * Validates and stores a new location.
+    *
+    * @todo Check if a Form Request would work better here.
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see LocationsController::getCreate() method that makes the form
+    * @since [v1.0]
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function store()
+    {
+        $location = new Location();
+        $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->manager_id       = Input::get('manager_id');
+        $location->user_id          = Auth::id();
+
+        if ($location->save()) {
+            return redirect()->route("locations.index")->with('success', trans('admin/locations/message.create.success'));
+        }
+        return redirect()->back()->withInput()->withErrors($location->getErrors());
+    }
+
+    /**
+    * Validates and stores a new location created via the Create Asset form modal.
+    *
+    * @todo Check if a Form Request would work better here.
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see AssetsController::getCreate() method that makes the form
+    * @since [v1.0]
+    * @return String JSON
+    */
+    public function apiStore()
+    {
+        $new['currency']=Setting::first()->default_currency;
+
+        // create a new location instance
+        $location = new Location();
+
+        // Save the location data
+        $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               = Input::get('city');
+        $location->state          = '';//e(Input::get('state'));
+        $location->country            = Input::get('country');
+        // $location->zip    			= e(Input::get('zip'));
+        $location->user_id          = Auth::id();
+
+        // Was the location created?
+        if ($location->save()) {
+            return JsonResponse::create($location);
+        }
+        // failure
+        return JsonResponse::create(["error" => "Failed validation: ".print_r($location->getErrors(), true)], 500);
+    }
+
+
+    /**
+    * 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($locationId = null)
+    {
+        // Check if the location exists
+        if (is_null($item = Location::find($locationId))) {
+            return redirect()->to('admin/settings/locations')->with('error', trans('admin/locations/message.does_not_exist'));
+        }
+
+        // Show the page
+        $locations = Location::orderBy('name', 'ASC')->get();
+        $location_options_array = Location::getLocationHierarchy($locations);
+        $location_options = Location::flattenLocationsArray($location_options_array);
+        $location_options = array('' => 'Top Level') + $location_options;
+
+
+        return view('locations/edit', compact('item'))
+            ->with('location_options', $location_options)
+            ->with('manager_list', Helper::managerList());
+    }
+
+
+    /**
+    * Validates and stores updated location data from edit form.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see LocationsController::getEdit() method that makes the form view
+    * @param int $locationId
+    * @since [v1.0]
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function update($locationId = null)
+    {
+        // Check if the location exists
+        if (is_null($location = Location::find($locationId))) {
+            return redirect()->to('admin/settings/locations')->with('error', trans('admin/locations/message.does_not_exist'));
+        }
+
+        // Update the location data
+        $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');
+        $location->manager_id   = Input::get('manager_id');
+
+        // Was the location updated?
+        if ($location->save()) {
+          // Redirect to the saved location page
+            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());
+    }
+
+    /**
+    * Validates and deletes selected location.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @param int $locationId
+    * @since [v1.0]
+    * @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(route('locations.index'))->with('error', trans('admin/locations/message.not_found'));
+        }
+
+
+        if ($location->users->count() > 0) {
+            return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.assoc_users'));
+        } elseif ($location->childLocations->count() > 0) {
+            return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.assoc_child_loc'));
+        } elseif ($location->assets->count() > 0) {
+            return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.assoc_assets'));
+        } elseif ($location->assignedassets->count() > 0) {
+            return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.assoc_assets'));
+        } else {
+            $location->delete();
+            return redirect()->to(route('locations.index'))->with('success', trans('admin/locations/message.delete.success'));
+        }
+    }
+
+
+    /**
+    * Returns a view that invokes the ajax tables which actually contains
+    * the content for the locations detail page.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @param int $locationId
+    * @since [v1.0]
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function show($locationId = null)
+    {
+        $location = Location::find($locationId);
+
+        if (isset($location->id)) {
+            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);
+    }
+
+}
@@ -0,0 +1,327 @@
+<?php
+namespace App\Http\Controllers;
+
+use App\Helpers\Helper;
+use App\Models\CustomField;
+use App\Models\Manufacturer;
+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
+ * the Snipe-IT Asset Management application.
+ *
+ * @version    v1.0
+ */
+class ManufacturersController extends Controller
+{
+    /**
+    * Returns a view that invokes the ajax tables which actually contains
+    * the content for the manufacturers listing, which is generated in getDatatable.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see Api\ManufacturersController::index() method that generates the JSON response
+    * @since [v1.0]
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function index()
+    {
+        return view('manufacturers/index', compact('manufacturers'));
+    }
+
+
+    /**
+    * Returns a view that displays a form to create a new manufacturer.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see ManufacturersController::store()
+    * @since [v1.0]
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function create()
+    {
+        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::create()
+     * @since [v1.0]
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function store(Request $request)
+    {
+
+        $manufacturer = new Manufacturer;
+        $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()->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::update()
+    * @param int $manufacturerId
+    * @since [v1.0]
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function edit($id = null)
+    {
+        // Check if the manufacturer exists
+        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('manufacturers/edit', compact('item'));
+    }
+
+
+    /**
+     * 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()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.does_not_exist'));
+        }
+
+        // Save the  data
+        $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');
+
+        if ($manufacturer->save()) {
+            return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.update.success'));
+        }
+        return redirect()->back()->withInput()->withErrors($manufacturer->getErrors());
+    }
+
+    /**
+    * Deletes a manufacturer.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @param int $manufacturerId
+    * @since [v1.0]
+    * @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()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.not_found'));
+        }
+
+        if ($manufacturer->has_models() > 0) {
+            // Redirect to the asset management page
+            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.
+    * This data contains a listing of all assets that belong to that manufacturer.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see ManufacturersController::getDataView()
+    * @param int $manufacturerId
+    * @since [v1.0]
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function show($manufacturerId = null)
+    {
+        $manufacturer = Manufacturer::find($manufacturerId);
+
+        if (isset($manufacturer->id)) {
+            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 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) {
+            case "assets":
+                return $this->getDataAssetsView($manufacturer, $request);
+            case "licenses":
+                return $this->getDataLicensesView($manufacturer, $request);
+            case "accessories":
+                return $this->getDataAccessoriesView($manufacturer, $request);
+            case "consumables":
+                return $this->getDataConsumablesView($manufacturer, $request);
+        }
+
+        return "We shouldn't be here";
+
+    }
+
+    protected function getDataAssetsView(Manufacturer $manufacturer, Request $request)
+    {
+        $manufacturer = $manufacturer->load('assets.model', 'assets.assignedTo', 'assets.assetstatus', 'assets.company');
+        $manufacturer_assets = $manufacturer->assets();
+
+        if ($request->has('search')) {
+            $manufacturer_assets = $manufacturer_assets->TextSearch(e($request->input('search')));
+        }
+
+        $offset = request('offset', 0);
+        $limit = request('limit', 50);
+
+        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
+
+        $allowed_columns = ['id','name','serial','asset_tag'];
+        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
+        $count = $manufacturer_assets->count();
+        $manufacturer_assets = $manufacturer_assets->skip($offset)->take($limit)->get();
+        $rows = array();
+        $all_custom_fields = CustomField::all(); // cached;
+        foreach ($manufacturer_assets as $asset) {
+            $rows[] = $asset->present()->forDataTable($all_custom_fields);
+        }
+
+        $data = array('total' => $count, 'rows' => $rows);
+        return $data;
+    }
+
+    protected function getDataLicensesView(Manufacturer $manufacturer, Request $request)
+    {
+        $manufacturer = $manufacturer->load('licenses.company', 'licenses.manufacturer', 'licenses.licenseSeatsRelation');
+        $licenses = $manufacturer->licenses;
+
+        if ($request->has('search')) {
+            $licenses = $licenses->TextSearch($request->input('search'));
+        }
+
+        $licenseCount = $licenses->count();
+
+        $rows = array();
+
+        foreach ($licenses as $license) {
+            $rows[] = $license->present()->forDataTable();
+        }
+
+        $data = array('total' => $licenseCount, 'rows' => $rows);
+
+        return $data;
+    }
+
+    public function getDataAccessoriesView(Manufacturer $manufacturer, Request $request)
+    {
+        $manufacturer = $manufacturer->load(
+            'accessories.location',
+            'accessories.company',
+            'accessories.category',
+            'accessories.manufacturer',
+            'accessories.users'
+        );
+        $accessories = $manufacturer->accessories();
+
+        if ($request->has('search')) {
+            $accessories = $accessories->TextSearch(e($request->input('search')));
+        }
+
+        $offset = request('offset', 0);
+        $limit = request('limit', 50);
+
+        $accessCount = $accessories->count();
+        $accessories = $accessories->skip($offset)->take($limit)->get();
+        $rows = array();
+
+        foreach ($accessories as $accessory) {
+            $rows[] = $accessory->present()->forDataTable();
+        }
+
+        $data = array('total'=>$accessCount, 'rows'=>$rows);
+
+        return $data;
+    }
+
+    public function getDataConsumablesView($manufacturer, Request $request)
+    {
+        $manufacturer = $manufacturer->load(
+            'consumables.location',
+            'consumables.company',
+            'consumables.category',
+            'consumables.manufacturer',
+            'consumables.users'
+        );
+        $consumables = $manufacturer->consumables();
+
+        if ($request->has('search')) {
+            $consumables = $consumables->TextSearch(e($request->input('search')));
+        }
+
+        $offset = request('offset', 0);
+        $limit = request('limit', 50);
+
+
+        $consumCount = $consumables->count();
+        $consumables = $consumables->skip($offset)->take($limit)->get();
+        $rows = array();
+
+        foreach ($consumables as $consumable) {
+            $rows[] = $consumable->present()->forDataTable();
+        }
+
+        $data = array('total' => $consumCount, 'rows' => $rows);
+
+        return $data;
+    }
+}
@@ -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');
+    }
+}
@@ -0,0 +1,147 @@
+<?php
+namespace App\Http\Controllers;
+
+use Image;
+use Input;
+use Redirect;
+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
+ * the Snipe-IT Asset Management application.
+ *
+ * @version    v1.0
+ */
+class ProfileController extends Controller
+{
+    /**
+    * Returns a view with the user's profile form for editing
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @return \Illuminate\Contracts\View\View
+     */
+    public function getIndex()
+    {
+        $user = Auth::user();
+        $location_list = Helper::locationsList();
+        return view('account/profile', compact('user'))->with('location_list', $location_list);
+    }
+
+    /**
+    * Validates and stores the user's update data.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @return \Illuminate\Http\RedirectResponse
+     */
+    public function postIndex()
+    {
+
+        $user = Auth::user();
+        $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 = Input::get('two_factor_optin', '0');
+        }
+        
+        if (Input::file('avatar')) {
+            $image = Input::file('avatar');
+            $file_name = str_slug($user->first_name."-".$user->last_name).".".$image->getClientOriginalExtension();
+            $path = public_path('uploads/avatars/'.$file_name);
+            Image::make($image->getRealPath())->resize(84, 84)->save($path);
+            $user->avatar = $file_name;
+        }
+
+        if (Input::get('avatar_delete') == 1 && Input::file('avatar') == "") {
+            $user->avatar = null;
+        }
+
+        if ($user->save()) {
+            return redirect()->route('profile')->with('success', 'Account successfully updated');
+        }
+        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);
+
+
+    }
+
+
+}
@@ -0,0 +1,857 @@
+<?php
+namespace App\Http\Controllers;
+
+use App\Helpers\Helper;
+use App\Models\Accessory;
+use App\Models\Actionlog;
+use App\Models\Asset;
+use App\Models\AssetMaintenance;
+use App\Models\CustomField;
+use App\Models\License;
+use App\Models\Setting;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\View;
+use Input;
+use League\Csv\Reader;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+/**
+ * This controller handles all actions related to Reports for
+ * the Snipe-IT Asset Management application.
+ *
+ * @version    v1.0
+ */
+class ReportsController extends Controller
+{
+
+    /**
+    * Returns a view that displays the accessories report.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @return View
+    */
+    public function getAccessoryReport()
+    {
+        $accessories = Accessory::orderBy('created_at', 'DESC')->with('company')->get();
+        return view('reports/accessories', compact('accessories'));
+    }
+
+    /**
+    * Exports the accessories to CSV
+    *
+    * @deprecated Server-side exports have been replaced by datatables export since v2.
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see ManufacturersController::getDatatable() method that generates the JSON response
+    * @since [v1.0]
+    * @return \Illuminate\Http\Response
+    */
+    public function exportAccessoryReport()
+    {
+        $accessories = Accessory::orderBy('created_at', 'DESC')->get();
+
+        $rows = array();
+        $header = array(
+            trans('admin/accessories/table.title'),
+            trans('admin/accessories/general.accessory_category'),
+            trans('admin/accessories/general.total'),
+            trans('admin/accessories/general.remaining')
+        );
+        $header = array_map('trim', $header);
+        $rows[] = implode($header, ', ');
+
+        // Row per accessory
+        foreach ($accessories as $accessory) {
+            $row = array();
+            $row[] = e($accessory->accessory_name);
+            $row[] = e($accessory->accessory_category);
+            $row[] = e($accessory->total);
+            $row[] = e($accessory->remaining);
+
+            $rows[] = implode($row, ',');
+        }
+
+        $csv = implode($rows, "\n");
+        $response = Response::make($csv, 200);
+        $response->header('Content-Type', 'text/csv');
+        $response->header('Content-disposition', 'attachment;filename=report.csv');
+
+        return $response;
+    }
+
+    /**
+    * Display asset report view.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @return View
+    */
+    public function getAssetsReport()
+    {
+        $settings = \App\Models\Setting::first();
+        return view('reports/asset', compact('assets'))->with('settings', $settings);
+    }
+
+
+
+    /**
+    * Exports the assets to CSV
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @return \Illuminate\Http\Response
+    */
+    public function exportAssetReport()
+    {
+
+         \Debugbar::disable();
+
+        $customfields = CustomField::get();
+
+        $response = new StreamedResponse(function () use ($customfields) {
+            // Open output stream
+            $handle = fopen('php://output', 'w');
+
+            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'),
+                    trans('admin/hardware/form.manufacturer'),
+                    trans('admin/hardware/form.model'),
+                    trans('general.model_no'),
+                    trans('general.name'),
+                    trans('admin/hardware/table.serial'),
+                    trans('general.status'),
+                    trans('admin/hardware/table.purchase_date'),
+                    trans('admin/hardware/table.purchase_cost'),
+                    trans('admin/hardware/form.order'),
+                    trans('admin/hardware/form.supplier'),
+                    trans('admin/hardware/table.checkoutto'),
+                    trans('admin/hardware/table.checkout_date'),
+                    trans('admin/hardware/table.location'),
+                    trans('general.notes'),
+                ];
+                foreach ($customfields as $field) {
+                    $headers[]=$field->name;
+                }
+                fputcsv($handle, $headers);
+
+                foreach ($assets as $asset) {
+                    // Add a new row with data
+                    $values=[
+                        ($asset->company) ? $asset->company->name : '',
+                        $asset->asset_tag,
+                        ($asset->model->manufacturer) ? $asset->model->manufacturer->name : '',
+                        ($asset->model) ? $asset->model->name : '',
+                        ($asset->model->model_number) ? $asset->model->model_number : '',
+                        ($asset->name) ? $asset->name : '',
+                        ($asset->serial) ? $asset->serial : '',
+                        ($asset->assetstatus) ? e($asset->assetstatus->name) : '',
+                        ($asset->purchase_date) ? e($asset->purchase_date) : '',
+                        ($asset->purchase_cost > 0) ? Helper::formatCurrencyOutput($asset->purchase_cost) : '',
+                        ($asset->order_number) ? e($asset->order_number) : '',
+                        ($asset->supplier) ? e($asset->supplier->name) : '',
+                        ($asset->assignedTo) ? e($asset->assignedTo->present()->name()) : '',
+                        ($asset->last_checkout!='') ? e($asset->last_checkout) : '',
+                        e($asset->assetLoc->present()->name()),
+                        ($asset->notes) ? e($asset->notes) : '',
+                    ];
+                    foreach ($customfields as $field) {
+                        $values[]=$asset->{$field->db_column_name()};
+                    }
+                    fputcsv($handle, $values);
+                }
+            });
+
+            // Close the output stream
+            fclose($handle);
+        }, 200, [
+            'Content-Type' => 'text/csv',
+            'Content-Disposition' => 'attachment; filename="assets-'.date('Y-m-d-his').'.csv"',
+        ]);
+
+        return $response;
+
+    }
+
+    /**
+    * Show depreciation report for assets.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @return View
+    */
+    public function getDeprecationReport()
+    {
+
+        // Grab all the assets
+        $assets = Asset::with( 'assignedTo', 'assetstatus', 'defaultLoc', 'assetloc', 'assetlog', 'company', 'model.category', 'model.depreciation')
+                       ->orderBy('created_at', 'DESC')->get();
+
+        return view('reports/depreciation', compact('assets'));
+    }
+
+    /**
+    * Exports the depreciations to CSV
+    *
+    * @deprecated Server-side exports have been replaced by datatables export since v2.
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @return \Illuminate\Http\Response
+    */
+    public function exportDeprecationReport()
+    {
+
+        // Grab all the assets
+        $assets = Asset::with('model', 'assignedTo', 'assetstatus', 'defaultLoc', 'assetlog')
+                       ->orderBy('created_at', 'DESC')->get();
+
+        $csv = \League\Csv\Writer::createFromFileObject(new \SplTempFileObject());
+        $csv->setOutputBOM(Reader::BOM_UTF16_BE);
+
+        $rows = [ ];
+
+        // Create the header row
+        $header = [
+            trans('admin/hardware/table.asset_tag'),
+            trans('admin/hardware/table.title'),
+            trans('admin/hardware/table.serial'),
+            trans('admin/hardware/table.checkoutto'),
+            trans('admin/hardware/table.location'),
+            trans('admin/hardware/table.purchase_date'),
+            trans('admin/hardware/table.purchase_cost'),
+            trans('admin/hardware/table.book_value'),
+            trans('admin/hardware/table.diff')
+        ];
+
+        //we insert the CSV header
+        $csv->insertOne($header);
+
+        // Create a row per asset
+        foreach ($assets as $asset) {
+            $row   = [ ];
+            $row[] = e($asset->asset_tag);
+            $row[] = e($asset->name);
+            $row[] = e($asset->serial);
+
+            if ($target = $asset->assignedTo) {
+                $row[] = e($target->present()->name());
+            } else {
+                $row[] = ''; // Empty string if unassigned
+            }
+
+            if (( $asset->assigned_to > 0 ) && ( $location = $asset->assetLoc )) {
+                if ($location->city) {
+                    $row[] = e($location->city) . ', ' . e($location->state);
+                } elseif ($location->name) {
+                    $row[] = e($location->name);
+                } else {
+                    $row[] = '';
+                }
+            } else {
+                $row[] = '';  // Empty string if location is not set
+            }
+
+            if ($asset->assetloc) {
+                $currency = e($asset->assetloc->currency);
+            } else {
+                $currency = e(Setting::first()->default_currency);
+            }
+
+            $row[] = $asset->purchase_date;
+            $row[] = $currency . Helper::formatCurrencyOutput($asset->purchase_cost);
+            $row[] = $currency . Helper::formatCurrencyOutput($asset->getDepreciatedValue());
+            $row[] = $currency . Helper::formatCurrencyOutput(( $asset->purchase_cost - $asset->getDepreciatedValue() ));
+            $csv->insertOne($row);
+        }
+
+        $csv->output('depreciation-report-' . date('Y-m-d') . '.csv');
+        die;
+
+    }
+
+
+    /**
+     * Displays audit report.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return View
+     */
+    public function audit()
+    {
+        return view('reports/audit');
+    }
+
+
+    /**
+    * Displays activity report.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @return View
+    */
+    public function getActivityReport()
+    {
+
+        return view('reports/activity');
+    }
+
+
+    /**
+     * Displays license report
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return View
+     */
+    public function getLicenseReport()
+    {
+
+        $licenses = License::with('depreciation')->orderBy('created_at', 'DESC')
+                           ->with('company')
+                           ->get();
+
+        return view('reports/licenses', compact('licenses'));
+    }
+
+    /**
+    * Exports the licenses to CSV
+    *
+    * @deprecated Server-side exports have been replaced by datatables export since v2.
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @since [v1.0]
+    * @return \Illuminate\Http\Response
+    */
+    public function exportLicenseReport()
+    {
+        $licenses = License::orderBy('created_at', 'DESC')->get();
+
+        $rows     = [ ];
+        $header   = [
+            trans('admin/licenses/table.title'),
+            trans('admin/licenses/table.serial'),
+            trans('admin/licenses/form.seats'),
+            trans('admin/licenses/form.remaining_seats'),
+            trans('admin/licenses/form.expiration'),
+            trans('general.purchase_date'),
+            trans('general.depreciation'),
+            trans('general.purchase_cost')
+        ];
+
+        $header = array_map('trim', $header);
+        $rows[] = implode($header, ', ');
+
+        // Row per license
+        foreach ($licenses as $license) {
+            $row   = [ ];
+            $row[] = e($license->name);
+            $row[] = e($license->serial);
+            $row[] = e($license->seats);
+            $row[] = $license->remaincount();
+            $row[] = $license->expiration_date;
+            $row[] = $license->purchase_date;
+            $row[] = ($license->depreciation!='') ? '' : e($license->depreciation->name);
+            $row[] = '"' . Helper::formatCurrencyOutput($license->purchase_cost) . '"';
+
+            $rows[] = implode($row, ',');
+        }
+
+        $csv      = implode($rows, "\n");
+        $response = Response::make($csv, 200);
+        $response->header('Content-Type', 'text/csv');
+        $response->header('Content-disposition', 'attachment;filename=report.csv');
+
+        return $response;
+    }
+
+    /**
+    * Returns a form that allows the user to generate a custom CSV report.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see ReportsController::postCustomReport() method that generates the CSV
+    * @since [v1.0]
+    * @return \Illuminate\Http\Response
+    */
+    public function getCustomReport()
+    {
+        $customfields = CustomField::get();
+        return view('reports/custom')->with('customfields', $customfields);
+    }
+
+    /**
+     * Exports the custom report to CSV
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @see ReportsController::getCustomReport() method that generates form view
+     * @since [v1.0]
+     * @return \Illuminate\Http\Response
+     */
+    public function postCustom()
+    {
+        $assets = Asset::orderBy('created_at', 'DESC')->with('company', 'assignedTo', 'assetloc', 'defaultLoc', 'model', 'supplier', 'assetstatus', 'model.manufacturer')->get();
+        $customfields = CustomField::get();
+
+        $rows   = [ ];
+        $header = [ ];
+
+        if (e(Input::get('company')) == '1') {
+            $header[] = 'Company Name';
+        }
+
+        if (e(Input::get('asset_name')) == '1') {
+            $header[] = 'Asset Name';
+        }
+        if (e(Input::get('asset_tag')) == '1') {
+            $header[] = 'Asset Tag';
+        }
+        if (e(Input::get('manufacturer')) == '1') {
+            $header[] = 'Manufacturer';
+        }
+        if (e(Input::get('model')) == '1') {
+            $header[] = 'Model';
+            $header[] = 'Model Number';
+        }
+        if (e(Input::get('category')) == '1') {
+            $header[] = 'Category';
+        }
+        if (e(Input::get('serial')) == '1') {
+            $header[] = 'Serial';
+        }
+        if (e(Input::get('purchase_date')) == '1') {
+            $header[] = 'Purchase Date';
+        }
+        if (( e(Input::get('purchase_cost')) == '1' ) && ( e(Input::get('depreciation')) != '1' )) {
+            $header[] = 'Purchase Cost';
+        }
+        if (e(Input::get('eol')) == '1') {
+            $header[] = 'EOL';
+        }
+        if (e(Input::get('order')) == '1') {
+            $header[] = 'Order Number';
+        }
+        if (e(Input::get('supplier')) == '1') {
+            $header[] = 'Supplier';
+        }
+        if (e(Input::get('location')) == '1') {
+            $header[] = 'Location';
+        }
+        if (e(Input::get('assigned_to')) == '1') {
+            $header[] = 'Assigned To';
+        }
+        if (e(Input::get('username')) == '1') {
+            $header[] = 'Username';
+        }
+        if (e(Input::get('employee_num')) == '1') {
+            $header[] = 'Employee No.';
+        }
+        if (e(Input::get('status')) == '1') {
+            $header[] = 'Status';
+        }
+        if (e(Input::get('warranty')) == '1') {
+            $header[] = 'Warranty';
+            $header[] = 'Warranty Expires';
+        }
+        if (e(Input::get('depreciation')) == '1') {
+            $header[] = 'Purchase Cost';
+            $header[] = 'Value';
+            $header[] = 'Diff';
+        }
+        if (e(Input::get('expected_checkin')) == '1') {
+            $header[] = trans('admin/hardware/form.expected_checkin');
+        }
+
+        if (e(Input::get('notes')) == '1') {
+            $header[] = trans('general.notes');
+        }
+
+
+        foreach ($customfields as $customfield) {
+            if (e(Input::get($customfield->db_column_name())) == '1') {
+                $header[] = $customfield->name;
+            }
+        }
+
+
+        $header = array_map('trim', $header);
+        $rows[] = implode($header, ',');
+
+        foreach ($assets as $asset) {
+            $row = [ ];
+
+            if (e(Input::get('company')) == '1') {
+                $row[] = is_null($asset->company) ? '' : '"'.$asset->company->name.'"';
+            }
+
+            if (e(Input::get('asset_name')) == '1') {
+                $row[] = '"' .e($asset->name) . '"';
+            }
+            if (e(Input::get('asset_tag')) == '1') {
+                $row[] = e($asset->asset_tag);
+            }
+            if (e(Input::get('manufacturer')) == '1') {
+                if ($asset->model->manufacturer) {
+                    $row[] = '"' .e($asset->model->manufacturer->name) . '"';
+                } else {
+                    $row[] = '';
+                }
+            }
+            if (e(Input::get('model')) == '1') {
+                $row[] = '"' . e($asset->model->name) . '"';
+                $row[] = '"' . e($asset->model->model_number) . '"';
+            }
+            if (e(Input::get('category')) == '1') {
+                $row[] = '"' .e($asset->model->category->name) . '"';
+            }
+
+            if (e(Input::get('serial')) == '1') {
+                $row[] = e($asset->serial);
+            }
+            if (e(Input::get('purchase_date')) == '1') {
+                $row[] = e($asset->purchase_date);
+            }
+            if (e(Input::get('purchase_cost')) == '1' && ( e(Input::get('depreciation')) != '1' )) {
+                $row[] = '"' . Helper::formatCurrencyOutput($asset->purchase_cost) . '"';
+            }
+            if (e(Input::get('eol')) == '1') {
+                $row[] = '"' .($asset->present()->eol_date()) ? $asset->present()->eol_date() : ''. '"';
+            }
+            if (e(Input::get('order')) == '1') {
+                if ($asset->order_number) {
+                    $row[] = e($asset->order_number);
+                } else {
+                    $row[] = '';
+                }
+            }
+            if (e(Input::get('supplier')) == '1') {
+                if ($asset->supplier) {
+                    $row[] = '"' .e($asset->supplier->name) . '"';
+                } else {
+                    $row[] = '';
+                }
+            }
+
+            if (e(Input::get('location')) == '1') {
+                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->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->checkedOutToUser()) {
+                    $row[] = '"' .e($asset->assignedTo->username). '"';
+                } else {
+                    $row[] = ''; // Empty string if unassigned
+                }
+            }
+
+            if (e(Input::get('employee_num')) == '1') {
+                // Only works if we're checked out to a user, not anything else.
+                if ($asset->checkedOutToUser()) {
+                    $row[] = '"' .e($asset->assignedTo->employee_num). '"';
+                } else {
+                    $row[] = ''; // Empty string if unassigned
+                }
+            }
+
+            if (e(Input::get('status')) == '1') {
+                if (( $asset->status_id == '0' ) && ( $asset->assigned_to == '0' )) {
+                    $row[] = trans('general.ready_to_deploy');
+                } elseif (( $asset->status_id == '' ) && ( $asset->assigned_to == '0' )) {
+                    $row[] = trans('general.pending');
+                } elseif ($asset->assetstatus) {
+                    $row[] = '"' .e($asset->assetstatus->name). '"';
+                } else {
+                    $row[] = '';
+                }
+            }
+            if (e(Input::get('warranty')) == '1') {
+                if ($asset->warranty_months) {
+                    $row[] = $asset->warranty_months;
+                    $row[] = $asset->present()->warrantee_expires();
+                } else {
+                    $row[] = '';
+                    $row[] = '';
+                }
+            }
+            if (e(Input::get('depreciation')) == '1') {
+                $depreciation = $asset->getDepreciatedValue();
+                $row[]        = '"' . Helper::formatCurrencyOutput($asset->purchase_cost) . '"';
+                $row[]        = '"' . Helper::formatCurrencyOutput($depreciation) . '"';
+                $row[]        = '"' . Helper::formatCurrencyOutput($asset->purchase_cost) . '"';
+            }
+            if (e(Input::get('expected_checkin')) == '1') {
+                if ($asset->expected_checkin) {
+                    $row[] = '"' .e($asset->expected_checkin). '"';
+                } else {
+                    $row[] = ''; // Empty string if blankd
+                }
+            }
+
+            if (e(Input::get('notes')) == '1') {
+                if ($asset->notes) {
+                    $row[] = '"' .$asset->notes . '"';
+                } else {
+                    $row[] = '';
+                }
+            }
+
+            foreach ($customfields as $customfield) {
+                $column_name = $customfield->db_column_name();
+                if (e(Input::get($customfield->db_column_name())) == '1') {
+                    $row[] = str_replace(",", "\,", $asset->$column_name);
+                }
+            }
+
+
+            $rows[] = implode($row, ',');
+        }
+
+        // spit out a csv
+        if (array_filter($rows)) {
+            $csv      = implode($rows, "\n");
+            $response = Response::make($csv, 200);
+            $response->header('Content-Type', 'text/csv');
+            $response->header('Content-disposition', 'attachment;filename='.date('Y-m-d-His').'-custom-asset-report.csv');
+
+            return $response;
+        } else {
+            return redirect()->to("reports/custom")
+                ->with('error', trans('admin/reports/message.error'));
+        }
+    }
+
+
+    /**
+     * getImprovementsReport
+     *
+     * @return View
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @version v1.0
+     */
+    public function getAssetMaintenancesReport()
+    {
+        // Grab all the improvements
+        $assetMaintenances = AssetMaintenance::with('asset', 'supplier', 'asset.company')
+                                              ->orderBy('created_at', 'DESC')
+                                              ->get();
+
+        return view('reports/asset_maintenances', compact('assetMaintenances'));
+
+    }
+
+    /**
+     * exportImprovementsReport
+     *
+     * @return \Illuminate\Http\Response
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @version v1.0
+     */
+    public function exportAssetMaintenancesReport()
+    {
+        // Grab all the improvements
+        $assetMaintenances = AssetMaintenance::with('asset', 'supplier')
+                                             ->orderBy('created_at', 'DESC')
+                                             ->get();
+
+        $rows = [ ];
+
+        $header = [
+            trans('admin/hardware/table.asset_tag'),
+            trans('admin/asset_maintenances/table.asset_name'),
+            trans('general.supplier'),
+            trans('admin/asset_maintenances/form.asset_maintenance_type'),
+            trans('admin/asset_maintenances/form.title'),
+            trans('admin/asset_maintenances/form.start_date'),
+            trans('admin/asset_maintenances/form.completion_date'),
+            trans('admin/asset_maintenances/form.asset_maintenance_time'),
+            trans('admin/asset_maintenances/form.cost')
+        ];
+
+        $header = array_map('trim', $header);
+        $rows[] = implode($header, ',');
+
+        foreach ($assetMaintenances as $assetMaintenance) {
+            $row   = [ ];
+            $row[] = str_replace(',', '', e($assetMaintenance->asset->asset_tag));
+            $row[] = str_replace(',', '', e($assetMaintenance->asset->name));
+            $row[] = str_replace(',', '', e($assetMaintenance->supplier->name));
+            $row[] = e($assetMaintenance->improvement_type);
+            $row[] = e($assetMaintenance->title);
+            $row[] = e($assetMaintenance->start_date);
+            $row[] = e($assetMaintenance->completion_date);
+            if (is_null($assetMaintenance->asset_maintenance_time)) {
+                $improvementTime = intval(Carbon::now()
+                                                 ->diffInDays(Carbon::parse($assetMaintenance->start_date)));
+            } else {
+                $improvementTime = intval($assetMaintenance->asset_maintenance_time);
+            }
+            $row[]  = $improvementTime;
+            $row[]  = trans('general.currency') . Helper::formatCurrencyOutput($assetMaintenance->cost);
+            $rows[] = implode($row, ',');
+        }
+
+        // spit out a csv
+        $csv      = implode($rows, "\n");
+        $response = Response::make($csv, 200);
+        $response->header('Content-Type', 'text/csv');
+        $response->header('Content-disposition', 'attachment;filename=report.csv');
+
+        return $response;
+    }
+
+    /**
+     * getAssetAcceptanceReport
+     *
+     * @return mixed
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @version v1.0
+     */
+    public function getAssetAcceptanceReport()
+    {
+        $assetsForReport = Asset::notYetAccepted()->with('company')->get();
+
+        return view('reports/unaccepted_assets', compact('assetsForReport'));
+    }
+
+    /**
+     * exportAssetAcceptanceReport
+     *
+     * @return \Illuminate\Http\Response
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @version v1.0
+     */
+    public function exportAssetAcceptanceReport()
+    {
+
+        // Grab all the improvements
+        $assetsForReport = Actionlog::whereIn('id', $this->getAssetsNotAcceptedYet())
+                                    ->get();
+
+        $rows = [ ];
+
+        $header = [
+            trans('general.category'),
+            trans('admin/hardware/form.model'),
+            trans('admin/hardware/form.name'),
+            trans('admin/hardware/table.asset_tag'),
+            trans('admin/hardware/table.checkoutto'),
+        ];
+
+        $header = array_map('trim', $header);
+        $rows[] = implode($header, ',');
+
+        foreach ($assetsForReport as $assetItem) {
+            $row    = [ ];
+            $row[]  = str_replace(',', '', e($assetItem->assetlog->model->category->name));
+            $row[]  = str_replace(',', '', e($assetItem->assetlog->model->name));
+            $row[]  = str_replace(',', '', e($assetItem->assetlog->present()->name()));
+            $row[]  = str_replace(',', '', e($assetItem->assetlog->asset_tag));
+            $row[]  = str_replace(',', '', e($assetItem->assetlog->assignedTo->present()->name()));
+            $rows[] = implode($row, ',');
+        }
+
+        // spit out a csv
+        $csv      = implode($rows, "\n");
+        $response = Response::make($csv, 200);
+        $response->header('Content-Type', 'text/csv');
+        $response->header('Content-disposition', 'attachment;filename=report.csv');
+
+        return $response;
+
+    }
+
+    /**
+     * getCheckedOutAssetsRequiringAcceptance
+     *
+     * @param $modelsInCategoriesThatRequireAcceptance
+     *
+     * @return array
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @version v1.0
+     */
+    protected function getCheckedOutAssetsRequiringAcceptance($modelsInCategoriesThatRequireAcceptance)
+    {
+        $assets = Asset::deployed()
+                        ->inModelList($modelsInCategoriesThatRequireAcceptance)
+                        ->select('id')
+                        ->get()
+                        ->toArray();
+
+        return array_pluck($assets, 'id');
+    }
+
+    /**
+     * getModelsInCategoriesThatRequireAcceptance
+     *
+     * @param $assetCategoriesRequiringAcceptance
+     * @return array
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @version v1.0
+     */
+    protected function getModelsInCategoriesThatRequireAcceptance($assetCategoriesRequiringAcceptance)
+    {
+
+        return array_pluck(Model::inCategory($assetCategoriesRequiringAcceptance)
+                                 ->select('id')
+                                 ->get()
+                                 ->toArray(), 'id');
+    }
+
+    /**
+     * getCategoriesThatRequireAcceptance
+     *
+     * @return array
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @version v1.0
+     */
+    protected function getCategoriesThatRequireAcceptance()
+    {
+
+        return array_pluck(Category::requiresAcceptance()
+                                    ->select('id')
+                                    ->get()
+                                    ->toArray(), 'id');
+    }
+
+    /**
+     * getAssetsCheckedOutRequiringAcceptance
+     *
+     * @return array
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @version v1.0
+     */
+    protected function getAssetsCheckedOutRequiringAcceptance()
+    {
+
+        return $this->getCheckedOutAssetsRequiringAcceptance(
+            $this->getModelsInCategoriesThatRequireAcceptance($this->getCategoriesThatRequireAcceptance())
+        );
+    }
+
+    /**
+     * getAssetsNotAcceptedYet
+     *
+     * @return array
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @version v1.0
+     */
+    protected function getAssetsNotAcceptedYet()
+    {
+        return Asset::unaccepted();
+    }
+}
@@ -0,0 +1,217 @@
+<?php
+namespace App\Http\Controllers;
+
+use Input;
+use Lang;
+use App\Models\Statuslabel;
+use App\Models\Asset;
+use Redirect;
+use DB;
+use App\Models\Setting;
+use Str;
+use View;
+use App\Helpers\Helper;
+use Auth;
+use Illuminate\Http\Request;
+
+use Symfony\Component\HttpFoundation\JsonResponse;
+
+/**
+ * This controller handles all actions related to Status Labels for
+ * the Snipe-IT Asset Management application.
+ *
+ * @version    v1.0
+ */
+class StatuslabelsController extends Controller
+{
+    /**
+     * Show a list of all the statuslabels.
+     *
+     * @return \Illuminate\Contracts\View\View
+     */
+
+    public function index()
+    {
+        return view('statuslabels/index', compact('statuslabels'));
+    }
+
+    public function show($id)
+    {
+        $statuslabel = Statuslabel::find($id);
+
+        if (isset($statuslabel->id)) {
+            return view('statuslabels/view', compact('statuslabel'));
+        }
+
+        return redirect()->route('statuslabels.index')->with('error', trans('admin/locations/message.does_not_exist', compact('id')));
+    }
+
+
+
+    /**
+     * Statuslabel create.
+     *
+     * @return \Illuminate\Contracts\View\View
+     */
+    public function create()
+    {
+        // Show the page
+        $item = new Statuslabel;
+        $use_statuslabel_type = $item->getStatuslabelType();
+        $statuslabel_types = Helper::statusTypeList();
+
+        return view('statuslabels/edit', compact('statuslabel_types', 'item'))->with('use_statuslabel_type', $use_statuslabel_type);
+    }
+
+
+    /**
+     * Statuslabel create form processing.
+     *
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function store(Request $request)
+    {
+
+        // create a new model instance
+        $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'));
+
+        // Save the Statuslabel data
+        $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()) {
+            // Redirect to the new Statuslabel  page
+            return redirect()->route('statuslabels.index')->with('success', trans('admin/statuslabels/message.create.success'));
+        }
+        return redirect()->back()->withInput()->withErrors($statusLabel->getErrors());
+    }
+
+    /**
+     * @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            = Input::get('name');
+        $statuslabel->user_id         = Auth::id();
+        $statuslabel->notes           =  '';
+        $statuslabel->deployable      =  $statustype['deployable'];
+        $statuslabel->pending         =  $statustype['pending'];
+        $statuslabel->archived        =  $statustype['archived'];
+
+
+        if ($statuslabel->isValid()) {
+            $statuslabel->save();
+            // Redirect to the new Statuslabel  page
+            return JsonResponse::create($statuslabel);
+        }
+        return JsonResponse::create(["error" => $statuslabel->getErrors()->first()], 500);
+
+    }
+
+
+    /**
+     * Statuslabel update.
+     *
+     * @param  int  $statuslabelId
+     * @return \Illuminate\Contracts\View\View
+     */
+    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()->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('statuslabels/edit', compact('item', 'statuslabel_types'))->with('use_statuslabel_type', $use_statuslabel_type);
+    }
+
+
+    /**
+     * Statuslabel update form processing page.
+     *
+     * @param  int  $statuslabelId
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    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()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.does_not_exist'));
+        }
+
+        if (!$request->has('statuslabel_types')) {
+            return redirect()->back()->withInput()->withErrors(['statuslabel_types' => trans('validation.statuslabel_type')]);
+        }
+
+
+        // Update the Statuslabel data
+        $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          =  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()->route("statuslabels.index")->with('success', trans('admin/statuslabels/message.update.success'));
+        }
+        return redirect()->back()->withInput()->withErrors($statuslabel->getErrors());
+    }
+
+    /**
+     * Delete the given Statuslabel.
+     *
+     * @param  int  $statuslabelId
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy($statuslabelId)
+    {
+        // Check if the Statuslabel exists
+        if (is_null($statuslabel = Statuslabel::find($statuslabelId))) {
+            // Redirect to the blogs management page
+            return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.not_found'));
+        }
+
+
+        if ($statuslabel->has_assets() == 0) {
+            $statuslabel->delete();
+            // Redirect to the statuslabels management page
+            return redirect()->route('statuslabels.index')->with('success', trans('admin/statuslabels/message.delete.success'));
+        }
+        // Redirect to the asset management page
+        return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.assoc_assets'));
+    }
+
+}
@@ -0,0 +1,234 @@
+<?php
+namespace App\Http\Controllers;
+
+use App\Helpers\Helper;
+use Image;
+use App\Models\AssetMaintenance;
+use Input;
+use Lang;
+use App\Models\Supplier;
+use Redirect;
+use App\Models\Setting;
+use Str;
+use View;
+use Auth;
+use Illuminate\Http\Request;
+
+use Symfony\Component\HttpFoundation\JsonResponse;
+
+/**
+ * This controller handles all actions related to Suppliers for
+ * the Snipe-IT Asset Management application.
+ *
+ * @version    v1.0
+ */
+class SuppliersController extends Controller
+{
+    /**
+     * Show a list of all suppliers
+     *
+     * @return \Illuminate\Contracts\View\View
+     */
+    public function index()
+    {
+        // Grab all the suppliers
+        $suppliers = Supplier::orderBy('created_at', 'DESC')->get();
+
+        // Show the page
+        return view('suppliers/index', compact('suppliers'));
+    }
+
+
+    /**
+     * Supplier create.
+     *
+     * @return \Illuminate\Contracts\View\View
+     */
+    public function create()
+    {
+        return view('suppliers/edit')->with('item', new Supplier);
+    }
+
+
+    /**
+     * Supplier create form processing.
+     *
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function store(Request $request)
+    {
+        // Create a new supplier
+        $supplier = new Supplier;
+        // Save the location data
+        $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 = $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) {
+                $constraint->aspectRatio();
+                $constraint->upsize();
+            })->save($path);
+                $supplier->image = $file_name;
+        }
+
+            // Was it created?
+        if ($supplier->save()) {
+          // Redirect to the new supplier  page
+            return redirect()->route('suppliers.index')->with('success', trans('admin/suppliers/message.create.success'));
+        }
+        return redirect()->back()->withInput()->withErrors($supplier->getErrors());
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function apiStore(Request $request)
+    {
+        $supplier = new Supplier;
+        $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);
+    }
+
+    /**
+     * Supplier update.
+     *
+     * @param  int  $supplierId
+     * @return \Illuminate\Contracts\View\View
+     */
+    public function edit($supplierId = null)
+    {
+        // Check if the supplier exists
+        if (is_null($item = Supplier::find($supplierId))) {
+            // Redirect to the supplier  page
+            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.does_not_exist'));
+        }
+
+        // Show the page
+        return view('suppliers/edit', compact('item'));
+    }
+
+
+    /**
+     * Supplier update form processing page.
+     *
+     * @param  int  $supplierId
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    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()->route('suppliers.index')->with('error', trans('admin/suppliers/message.does_not_exist'));
+        }
+
+        // Save the  data
+        $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 = $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) {
+                $constraint->aspectRatio();
+                $constraint->upsize();
+            })->save($path);
+            $supplier->image = $file_name;
+        }
+
+        if (request('image_delete') == 1 && $request->file('image') == "") {
+            $supplier->image = null;
+        }
+
+        if ($supplier->save()) {
+            return redirect()->route('suppliers.index')->with('success', trans('admin/suppliers/message.update.success'));
+        }
+
+        return redirect()->back()->withInput()->withErrors($supplier->getErrors());
+
+    }
+
+    /**
+     * Delete the given supplier.
+     *
+     * @param  int  $supplierId
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy($supplierId)
+    {
+        // Check if the supplier exists
+        if (is_null($supplier = Supplier::find($supplierId))) {
+            // Redirect to the suppliers page
+            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.not_found'));
+        }
+
+        if ($supplier->num_assets() == 0) {
+            // Delete the supplier
+            $supplier->delete();
+            // Redirect to the suppliers management page
+            return redirect()->route('suppliers.index')->with(
+                'success',
+                trans('admin/suppliers/message.delete.success')
+            );
+        }
+        // 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 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('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);
+    }
+
+}
@@ -0,0 +1,406 @@
+<?php
+namespace App\Http\Controllers;
+
+use App\Models\Accessory;
+use App\Models\Actionlog;
+use App\Models\Asset;
+use App\Models\AssetModel;
+use App\Models\CheckoutRequest;
+use App\Models\Company;
+use App\Models\Component;
+use App\Models\Consumable;
+use App\Models\License;
+use App\Models\Setting;
+use App\Models\User;
+use Auth;
+use Config;
+use DB;
+use Input;
+use Lang;
+use Mail;
+use Redirect;
+use Slack;
+use Validator;
+use View;
+use Illuminate\Http\Request;
+
+/**
+ * This controller handles all actions related to the ability for users
+ * to view their own assets in the Snipe-IT Asset Management application.
+ *
+ * @version    v1.0
+ */
+class ViewAssetsController extends Controller
+{
+    /**
+     * Redirect to the profile page.
+     *
+     * @return Redirect
+     */
+    public function getIndex()
+    {
+
+        $user = User::with(
+            'assets.model',
+            'consumables',
+            'accessories',
+            'licenses',
+            'userloc',
+            'userlog'
+        )->withTrashed()->find(Auth::user()->id);
+
+
+        $userlog = $user->userlog->load('item', 'user', 'target');
+
+        if (isset($user->id)) {
+            return view('account/view-assets', compact('user', 'userlog'));
+        } else {
+            // Prepare the error message
+            $error = trans('admin/users/message.user_not_found', compact('id'));
+
+            // Redirect to the user management page
+            return redirect()->route('users')->with('error', $error);
+        }
+
+    }
+
+
+    public function getRequestableIndex()
+    {
+
+        $assets = Asset::with('model', 'defaultLoc', 'assetloc', 'assignedTo', 'requests')->Hardware()->RequestableAssets()->get();
+        $models = AssetModel::with('category', 'requests', 'assets')->RequestableModels()->get();
+
+        return view('account/requestable-assets', compact('user', 'assets', 'models'));
+    }
+
+    public function getRequestedIndex()
+    {
+        $requestedItems = CheckoutRequest::with('user', 'requestedItem')->get();
+        return view('admin/requested-assets', compact('requestedItems'));
+    }
+
+
+    public function getRequestItem($itemType, $itemId = null)
+    {
+        $item = null;
+        $fullItemType = 'App\\Models\\' . studly_case($itemType);
+        if ($itemType == "asset_model") {
+            $itemType = "model";
+        }
+        $item = call_user_func(array($fullItemType, 'find'), $itemId);
+        $user = Auth::user();
+        $quantity = $data['item_quantity'] = Input::has('request-quantity') ? e(Input::get('request-quantity')) : 1;
+
+        $logaction = new Actionlog();
+        $logaction->item_id = $data['asset_id'] = $item->id;
+        $logaction->item_type = $fullItemType;
+        $logaction->created_at = $data['requested_date'] = date("Y-m-d H:i:s");
+        if ($user->location_id) {
+            $logaction->location_id = $user->location_id;
+        }
+        $logaction->target_id = $data['user_id'] = Auth::user()->id;
+        $logaction->target_type = User::class;
+
+        $data['requested_by'] = $user->present()->fullName();
+        $data['item_name'] = $item->name;
+        $data['item_type'] = $itemType;
+
+        if ($fullItemType == Asset::class) {
+            $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 <'.url('/').'/user/'.$item->id.'/view'.'|'.$user->present()->fullName().'>.';
+        }
+
+        $settings = Setting::getSettings();
+
+        if ($settings->slack_endpoint) {
+
+            $slack_settings = [
+                'username' => $settings->botname,
+                'channel' => $settings->slack_channel,
+                'link_names' => true
+            ];
+
+            $slackClient = new \Maknz\Slack\Client($settings->slack_endpoint, $slack_settings);
+        }
+
+        if ($item->isRequestedBy($user)) {
+
+            $item->cancelRequest();
+            $log = $logaction->logaction('request_canceled');
+
+            if (($settings->alert_email!='')  && ($settings->alerts_enabled=='1') && (!config('app.lock_passwords'))) {
+                Mail::send('emails.asset-canceled', $data, function ($m) use ($user, $settings) {
+                    $m->to(explode(',', $settings->alert_email), $settings->site_name);
+                    $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
+                    $m->subject(trans('mail.Item_Request_Canceled'));
+                });
+            }
+
+            if ($settings->slack_endpoint) {
+                try {
+                        $slackClient->attach([
+                            'color' => 'good',
+                            'fields' => [
+                                [
+                                    'title' => 'CANCELED:',
+                                    'value' => $slackMessage
+                                ]
+
+                            ]
+                        ])->send('Item Request Canceled');
+
+                } catch (Exception $e) {
+
+                }
+            }
+
+            return redirect()->route('requestable-assets')->with('success')->with('success', trans('admin/hardware/message.requests.canceled'));
+
+        } else {
+            $item->request();
+
+            $log = $logaction->logaction('requested');
+
+
+            if (($settings->alert_email!='')  && ($settings->alerts_enabled=='1') && (!config('app.lock_passwords'))) {
+                Mail::send('emails.asset-requested', $data, function ($m) use ($user, $settings) {
+                    $m->to(explode(',', $settings->alert_email), $settings->site_name);
+                    $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
+                    $m->subject(trans('mail.Item_Requested'));
+                });
+            }
+
+            if ($settings->slack_endpoint) {
+                try {
+                        $slackClient->attach([
+                            'color' => 'good',
+                            'fields' => [
+                                [
+                                    'title' => 'REQUESTED:',
+                                    'value' => $slackMessage
+                                ]
+
+                            ]
+                        ])->send('Item Requested');
+
+                } catch (Exception $e) {
+
+                }
+            }
+
+            return redirect()->route('requestable-assets')->with('success')->with('success', trans('admin/hardware/message.requests.success'));
+        }
+    }
+    public function getRequestAsset($assetId = null)
+    {
+
+        $user = Auth::user();
+
+        // Check if the asset exists and is requestable
+        if (is_null($asset = Asset::RequestableAssets()->find($assetId))) {
+            // Redirect to the asset management page
+            return redirect()->route('requestable-assets')->with('error', trans('admin/hardware/message.does_not_exist_or_not_requestable'));
+        } elseif (!Company::isCurrentUserHasAccess($asset)) {
+            return redirect()->route('requestable-assets')->with('error', trans('general.insufficient_permissions'));
+        }
+        // If it's requested, cancel the request.
+        if ($asset->isRequestedBy(Auth::user())) {
+            $asset->cancelRequest();
+            return redirect()->route('requestable-assets')->with('success')->with('success', trans('admin/hardware/message.requests.success'));
+        } else {
+
+            $logaction = new Actionlog();
+            $logaction->item_id = $data['asset_id'] = $asset->id;
+            $logaction->item_type = Asset::class;
+            $logaction->created_at = $data['requested_date'] = date("Y-m-d H:i:s");
+            $data['asset_type'] = 'hardware';
+            if ($user->location_id) {
+                $logaction->location_id = $user->location_id;
+            }
+            $logaction->target_id = $data['user_id'] = Auth::user()->id;
+            $logaction->target_type = User::class;
+            $log = $logaction->logaction('requested');
+
+            $data['requested_by'] = $user->present()->fullName();
+            $data['asset_name'] = $asset->present()->name();
+
+            $settings = Setting::getSettings();
+
+            if (($settings->alert_email!='')  && ($settings->alerts_enabled=='1') && (!config('app.lock_passwords'))) {
+                Mail::send('emails.asset-requested', $data, function ($m) use ($user, $settings) {
+                    $m->to(explode(',', $settings->alert_email), $settings->site_name);
+                    $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
+                    $m->subject(trans('mail.asset_requested'));
+                });
+            }
+
+            $asset->request();
+
+
+            if ($settings->slack_endpoint) {
+
+
+                $slack_settings = [
+                    'username' => $settings->botname,
+                    'channel' => $settings->slack_channel,
+                    'link_names' => true
+                ];
+
+                $client = new \Maknz\Slack\Client($settings->slack_endpoint, $slack_settings);
+
+                try {
+                        $client->attach([
+                            'color' => 'good',
+                            'fields' => [
+                                [
+                                    'title' => 'REQUESTED:',
+                                    'value' => 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().'>.'
+                                ]
+
+                            ]
+                        ])->send('Asset Requested');
+
+                } catch (Exception $e) {
+
+                }
+
+            }
+
+            return redirect()->route('requestable-assets')->with('success')->with('success', trans('admin/hardware/message.requests.success'));
+        }
+
+
+    }
+
+    public function getRequestedAssets()
+    {
+        $checkoutrequests = CheckoutRequest::all();
+
+        return view('account/requested-items', compact($checkoutrequests));
+    }
+
+
+
+    // Get the acceptance screen
+    public function getAcceptAsset($logID = null)
+    {
+
+        if (!$findlog = Actionlog::where('id', $logID)->first()) {
+            echo 'no record';
+            //return redirect()->to('account')->with('error', trans('admin/hardware/message.does_not_exist'));
+        }
+
+        if ($findlog->accepted_id!='') {
+            return redirect()->to('account/view-assets')->with('error', trans('admin/users/message.error.asset_already_accepted'));
+        }
+
+        $user = Auth::user();
+
+
+        if ($user->id != $findlog->item->assigned_to) {
+            return redirect()->to('account/view-assets')->with('error', trans('admin/users/message.error.incorrect_user_accepted'));
+        }
+
+        $item = $findlog->item;
+
+        // Check if the asset exists
+        if (is_null($item)) {
+            // Redirect to the asset management page
+            return redirect()->to('account')->with('error', trans('admin/hardware/message.does_not_exist'));
+        } elseif (!Company::isCurrentUserHasAccess($item)) {
+            return redirect()->route('requestable-assets')->with('error', trans('general.insufficient_permissions'));
+        } else {
+            return view('account/accept-asset', compact('item'))->with('findlog', $findlog)->with('item', $item);
+        }
+    }
+
+    // Save the acceptance
+    public function postAcceptAsset(Request $request, $logID = null)
+    {
+
+        // Check if the asset exists
+        if (is_null($findlog = Actionlog::where('id', $logID)->first())) {
+            // Redirect to the asset management page
+            return redirect()->to('account/view-assets')->with('error', trans('admin/hardware/message.does_not_exist'));
+        }
+
+
+        if ($findlog->accepted_id!='') {
+            // Redirect to the asset management page
+            return redirect()->to('account/view-assets')->with('error', trans('admin/users/message.error.asset_already_accepted'));
+        }
+
+        if (!Input::has('asset_acceptance')) {
+            return redirect()->back()->with('error', trans('admin/users/message.error.accept_or_decline'));
+        }
+
+        $user = Auth::user();
+
+        if ($user->id != $findlog->item->assigned_to) {
+            return redirect()->to('account/view-assets')->with('error', trans('admin/users/message.error.incorrect_user_accepted'));
+        }
+
+        if ($request->has('signature_output')) {
+            $path = config('app.private_uploads').'/signatures';
+            $sig_filename = "siglog-".$findlog->id.'-'.date('Y-m-d-his').".png";
+            $data_uri = e($request->get('signature_output'));
+            $encoded_image = explode(",", $data_uri);
+            $decoded_image = base64_decode($encoded_image[1]);
+            file_put_contents($path."/".$sig_filename, $decoded_image);
+        }
+
+
+        $logaction = new Actionlog();
+
+        if (Input::get('asset_acceptance')=='accepted') {
+            $logaction_msg  = 'accepted';
+            $accepted="accepted";
+            $return_msg = trans('admin/users/message.accepted');
+        } else {
+            $logaction_msg = 'declined';
+            $accepted="rejected";
+            $return_msg = trans('admin/users/message.declined');
+        }
+            $logaction->item_id      = $findlog->item_id;
+            $logaction->item_type    = $findlog->item_type;
+
+        // Asset
+        if (($findlog->item_id!='') && ($findlog->item_type==Asset::class)) {
+            if (Input::get('asset_acceptance')!='accepted') {
+                DB::table('assets')
+                ->where('id', $findlog->item_id)
+                ->update(array('assigned_to' => null));
+            }
+        }
+
+        $logaction->target_id = $findlog->target_id;
+        $logaction->target_type = User::class;
+        $logaction->note = e(Input::get('note'));
+        $logaction->updated_at = date("Y-m-d H:i:s");
+
+
+        if (isset($sig_filename)) {
+            $logaction->accept_signature = $sig_filename;
+        }
+        $log = $logaction->logaction($logaction_msg);
+
+        $update_checkout = DB::table('action_logs')
+        ->where('id', $findlog->id)
+        ->update(array('accepted_id' => $logaction->id));
+
+            $affected_asset = $logaction->item;
+            $affected_asset->accepted = $accepted;
+            $affected_asset->save();
+
+        if ($update_checkout) {
+            return redirect()->to('account/view-assets')->with('success', $return_msg);
+
+        } else {
+            return redirect()->to('account/view-assets')->with('error', 'Something went wrong ');
+        }
+    }
+}
@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Http;
+
+use Illuminate\Foundation\Http\Kernel as HttpKernel;
+
+class Kernel extends HttpKernel
+{
+    /**
+     * The application's global HTTP middleware stack.
+     *
+     * These middleware are run during every request to your application.
+     *
+     * @var array
+     */
+    protected $middleware = [
+        \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
+        \Illuminate\Session\Middleware\StartSession::class,
+        \Illuminate\View\Middleware\ShareErrorsFromSession::class,
+        \App\Http\Middleware\FrameGuard::class,
+        \App\Http\Middleware\XssProtectHeader::class,
+        \App\Http\Middleware\NosniffGuard::class,
+        \App\Http\Middleware\CheckForSetup::class,
+        \Fideloper\Proxy\TrustProxies::class,
+        \App\Http\Middleware\CheckForDebug::class,
+    ];
+
+    /**
+     * The application's route middleware groups.
+     *
+     * @var array
+     */
+    protected $middlewareGroups = [
+        'web' => [
+            \App\Http\Middleware\EncryptCookies::class,
+            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
+            \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',
+        ],
+    ];
+
+    /**
+     * The application's route middleware.
+     *
+     * These middleware may be assigned to groups or used individually.
+     *
+     * @var array
+     */
+    protected $routeMiddleware = [
+        '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,
+    ];
+}
@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Contracts\Auth\Guard;
+
+class Authenticate
+{
+    /**
+     * The Guard implementation.
+     *
+     * @var Guard
+     */
+    protected $auth;
+
+    /**
+     * Create a new filter instance.
+     *
+     * @param  Guard  $auth
+     * @return void
+     */
+    public function __construct(Guard $auth)
+    {
+        $this->auth = $auth;
+    }
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if ($this->auth->guest()) {
+            if ($request->ajax()) {
+                return response('Unauthorized.', 401);
+            } else {
+                return redirect()->guest('login');
+            }
+        }
+
+        return $next($request);
+    }
+}
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Auth;
+
+class CheckForDebug
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        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);
+        }
+
+        return $next($request);
+    }
+}
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Config;
+use Route;
+use Schema;
+use App\Models\User;
+use App\Models\Setting;
+
+class CheckForSetup
+{
+    public function handle($request, Closure $next, $guard = null)
+    {
+
+        // This is dumb
+        if ($request->is('_debugbar*')) {
+            return $next($request);
+        }
+
+        if (Setting::setupCompleted()) {
+
+            if ($request->is('setup*')) {
+                return redirect(url('/'));
+            } else {
+                return $next($request);
+            }
+
+        } else {
+            if (!($request->is('setup*')) && !($request->is('.env'))) {
+                return redirect(url('/').'/setup')->with('Request', $request);
+            }
+
+            return $next($request);
+
+        }
+
+
+    }
+}
@@ -0,0 +1,52 @@
+<?php
+namespace App\Http\Middleware;
+
+use App\Models\Setting;
+use Auth;
+use Closure;
+use Illuminate\Support\Facades\Schema;
+use Log;
+
+class CheckForTwoFactor
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+
+        // Skip the logic if the user is on the two factor pages or the setup pages
+        if (($request->route()->getName()=='two-factor') || ($request->route()->getName()=='two-factor-enroll') || ($request->route()->getPrefix()=='setup') || ($request->route()->getName()=='logout')) {
+            return $next($request);
+        }
+
+        // Two-factor is enabled (either optional or required)
+        if (Setting::getSettings()) {
+            if (Auth::check() && (Setting::getSettings()->two_factor_enabled!='')) {
+
+                // This user is already 2fa-authed
+                if ($request->session()->get('2fa_authed')) {
+                    return $next($request);
+                }
+
+                // Two-factor is optional and the user has NOT opted in, let them through
+                if ((Setting::getSettings()->two_factor_enabled=='1') && (Auth::user()->two_factor_optin!='1')) {
+                    return $next($request);
+                }
+
+                // Otherwise make sure they're enrolled and show them the 2FA code screen
+                if ((Auth::user()->two_factor_secret!='') && (Auth::user()->two_factor_enrolled=='1')) {
+                    return redirect()->route('two-factor')->with('info', 'Please enter your two-factor authentication code.');
+                }
+
+                return redirect()->route('two-factor-enroll')->with('success', 'Please enroll a device in two-factor authentication.');
+            }
+        }
+        return $next($request);
+
+    }
+}
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Config;
+use Route;
+use Schema;
+use App\Models\Setting;
+
+class CheckLocale
+{
+  /**
+   * Handle the locale for the user, default to settings otherwise
+   *
+   * @param  \Illuminate\Http\Request  $request
+   * @param  \Closure  $next
+   * @param  string|null  $guard
+   * @return mixed
+   */
+
+    public function handle($request, Closure $next, $guard = null)
+    {
+
+
+        if (Setting::getSettings()) {
+            // User's preference
+            if (($request->user()) && ($request->user()->locale)) {
+                \App::setLocale($request->user()->locale);
+
+                // App setting preference
+            } elseif ((Setting::getSettings()) &&  (Setting::getSettings()->locale!='')) {
+                \App::setLocale(Setting::getSettings()->locale);
+
+                // Default app setting
+            } else {
+                \App::setLocale(config('app.locale'));
+            }
+        }
+        \App::setLocale(config('app.locale'));
+
+        return $next($request);
+    }
+}
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Config;
+use Route;
+use Gate;
+
+class CheckPermissions
+{
+  /**
+   * Handle the ACLs for permissions.
+   *
+   * The $section variable is passed via the route middleware,
+   * 'middleware' => [authorize:superadmin']
+   *
+   * @param  \Illuminate\Http\Request  $request
+   * @param  \Closure  $next
+   * @param  string|null  $section
+   * @return mixed
+   */
+    public function handle($request, Closure $next, $section = null)
+    {
+
+
+        if (Gate::allows($section)) {
+            return $next($request);
+        }
+
+        return response()->view('layouts/basic', [
+            'content' => view('errors/403')
+        ]);
+
+
+
+
+    }
+}
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Cookie\Middleware\EncryptCookies as BaseEncrypter;
+
+class EncryptCookies extends BaseEncrypter
+{
+    /**
+     * The names of the cookies that should not be encrypted.
+     *
+     * @var array
+     */
+    protected $except = [
+        //
+    ];
+}
@@ -0,0 +1,24 @@
+<?php
+namespace App\Http\Middleware;
+
+use Closure;
+
+class FrameGuard
+{
+    /**
+     * Handle the given request and get the response.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return \Illuminate\Http\Response
+     */
+    public function handle($request, Closure $next)
+    {
+        $response = $next($request);
+        if (config('app.allow_iframing') == false) {
+            $response->headers->set('X-Frame-Options', 'SAMEORIGIN', false);
+        }
+        return $response;
+
+    }
+}
@@ -0,0 +1,21 @@
+<?php
+namespace App\Http\Middleware;
+
+use Closure;
+
+class NosniffGuard
+{
+    /**
+     * Handle the given request and get the response.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return \Illuminate\Http\Response
+     */
+    public function handle($request, Closure $next)
+    {
+        $response = $next($request);
+        $response->headers->set('X-Content-Type-Options', 'nosniff', false);
+        return $response;
+    }
+}
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Support\Facades\Auth;
+
+class RedirectIfAuthenticated
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Closure $next
+     * @param  string|null $guard
+     * @return mixed
+     */
+    public function handle($request, Closure $next, $guard = null)
+    {
+        if (Auth::guard($guard)->check()) {
+            return redirect()->intended('/');
+        }
+
+        return $next($request);
+    }
+}
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;
+
+class VerifyCsrfToken extends BaseVerifier
+{
+    /**
+     * The URIs that should be excluded from CSRF verification.
+     *
+     * @var array
+     */
+    protected $except = [
+    ];
+}
@@ -0,0 +1,21 @@
+<?php
+namespace App\Http\Middleware;
+
+use Closure;
+
+class XssProtectHeader
+{
+    /**
+     * Handle the given request and get the response.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return \Illuminate\Http\Response
+     */
+    public function handle($request, Closure $next)
+    {
+        $response = $next($request);
+        $response->headers->set('X-XSS-Protection', '1');
+        return $response;
+    }
+}
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Http\Requests;
+
+use App\Http\Requests\Request;
+
+class AssetCheckinRequest extends Request
+{
+    /**
+     * 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 response(array $errors)
+    {
+        return $this->redirector->back()->withInput()->withErrors($errors, $this->errorBag);
+    }
+}
--- a/Show More
+++ b/Show More