Fixes #87 - made datatables responsive

Added default location to physical hardware
Fixes #279 - QR checkbox not staying checked
2014-10-16 17:46:47 -04:00 · 2014-10-16 17:41:56 -04:00 · 2014-10-16 15:39:05 -04:00 · 2014-09-10 11:51:31 -04:00 · 2014-09-10 08:55:57 +02:00 · 2014-09-08 14:25:32 -04:00
6003 changed files with 70789 additions and 552767 deletions
@@ -1,925 +0,0 @@
-{
-  "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"
-      ]
-    },
-    {
-      "login": "gizzmojr",
-      "name": "gizzmojr",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/3697569?v=4",
-      "profile": "https://github.com/gizzmojr",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "imjennyli",
-      "name": "Jenny Li",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/404729?v=4",
-      "profile": "https://github.com/imjennyli",
-      "contributions": [
-        "doc"
-      ]
-    },
-    {
-      "login": "GeoffYoung",
-      "name": "Geoff Young",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/869227?v=4",
-      "profile": "https://github.com/GeoffYoung",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "BlueHatbRit",
-      "name": "Elliot Blackburn",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/1068477?v=4",
-      "profile": "http://www.elliotblackburn.com",
-      "contributions": [
-        "doc"
-      ]
-    },
-    {
-      "login": "TonisOrmisson",
-      "name": "Tõnis Ormisson",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/6357451?v=4",
-      "profile": "http://andmemasin.eu",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "thakilla",
-      "name": "Nicolai Essig",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/449411?v=4",
-      "profile": "http://www.nicolai-essig.de",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "techincolor",
-      "name": "Danielle",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/14809698?v=4",
-      "profile": "https://github.com/techincolor",
-      "contributions": [
-        "doc"
-      ]
-    },
-    {
-      "login": "TheVakman",
-      "name": "Lawrence",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/18545156?v=4",
-      "profile": "https://github.com/TheVakman",
-      "contributions": [
-        "test",
-        "bug"
-      ]
-    },
-    {
-      "login": "uknzaeinozpas",
-      "name": "uknzaeinozpas",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/22473767?v=4",
-      "profile": "https://github.com/uknzaeinozpas",
-      "contributions": [
-        "test",
-        "code"
-      ]
-    },
-    {
-      "login": "Gelob",
-      "name": "Ryan",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/422752?v=4",
-      "profile": "https://github.com/Gelob",
-      "contributions": [
-        "doc"
-      ]
-    },
-    {
-      "login": "vcordes79",
-      "name": "vcordes79",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/10672546?v=4",
-      "profile": "https://github.com/vcordes79",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "fordster78",
-      "name": "fordster78",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/27958330?v=4",
-      "profile": "https://github.com/fordster78",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "CronKz",
-      "name": "CronKz",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/34064225?v=4",
-      "profile": "https://github.com/CronKz",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "tdb",
-      "name": "Tim Bishop",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/585486?v=4",
-      "profile": "https://github.com/tdb",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "seanmcilvenna",
-      "name": "Sean McIlvenna",
-      "avatar_url": "https://avatars2.githubusercontent.com/u/5384694?v=4",
-      "profile": "https://www.seanmcilvenna.com",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "cepacs",
-      "name": "cepacs",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/36515590?v=4",
-      "profile": "https://github.com/cepacs",
-      "contributions": [
-        "bug",
-        "doc"
-      ]
-    },
-    {
-      "login": "lea-mink",
-      "name": "lea-mink",
-      "avatar_url": "https://avatars2.githubusercontent.com/u/37537300?v=4",
-      "profile": "https://github.com/lea-mink",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "hannahtinkler",
-      "name": "Hannah Tinkler",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/7140719?v=4",
-      "profile": "https://github.com/hannahtinkler",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "doekman",
-      "name": "Doeke Zanstra",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/1086388?v=4",
-      "profile": "https://github.com/doekman",
-      "contributions": [
-        "code"
-      ]
-    }
-  ]
-}
@@ -0,0 +1,37 @@
+ls
+pwd
+cd app
+ls
+cd views/
+cd backend/
+ls
+cd users/
+ls
+vi view.blade.php 
+ls -alF
+cd
+pwd
+ls -alF
+pwd
+cd app
+ls
+cd views/
+cd backend/
+cd users/
+ls
+ls -alF
+chown snipeitftp view.blade.php
+sudo chown snipeitftp view.blade.php
+pwd
+ls
+vi view.blade.php
+set noswapfile
+set nobackup
+vi view.blade.php
+touch delete.me
+vi delete.me
+ls
+ls -alF
+touch view.blade.php
+touch index.blade.php
+vi view.blade.php
@@ -1,5 +0,0 @@
-.git
-.dockerignore
-app/storage/logs/*
-app/storage/views/*
-vendor/*
@@ -1,109 +0,0 @@
-# --------------------------------------------
-# REQUIRED: BASIC APP SETTINGS
-# --------------------------------------------
-APP_ENV=production
-APP_DEBUG=false
-APP_KEY=ChangeMe
-APP_URL=null
-APP_TIMEZONE='UTC'
-APP_LOCALE=en
-BACKUP_ENV=false
-
-# --------------------------------------------
-# REQUIRED: DATABASE SETTINGS
-# --------------------------------------------
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_DATABASE=null
-DB_USERNAME=null
-DB_PASSWORD=null
-DB_PREFIX=null
-DB_DUMP_PATH='/usr/bin'
-DB_CHARSET=utf8mb4
-DB_COLLATION=utf8mb4_unicode_ci
-
-# --------------------------------------------
-# 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: SECURITY HEADER SETTINGS
-# --------------------------------------------
-REFERRER_POLICY=same-origin
-ENABLE_CSP=false
-
-# --------------------------------------------
-# OPTIONAL: CACHE SETTINGS
-# --------------------------------------------
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-QUEUE_DRIVER=sync
-
-# --------------------------------------------
-# OPTIONAL: REDIS SETTINGS
-# --------------------------------------------
-REDIS_HOST=null
-REDIS_PASSWORD=null
-REDIS_PORT-null
-
-# --------------------------------------------
-# OPTIONAL: AWS S3 SETTINGS
-# --------------------------------------------
-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_LOG_MAX_FILES=10
-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
-GOOGLE_MAPS_API=
-BACKUP_ENV=true
@@ -1,72 +0,0 @@
-# --------------------------------------------
-# 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
@@ -1,71 +0,0 @@
-# --------------------------------------------
-# 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
@@ -1,22 +0,0 @@
-APP_ENV=testing
-APP_DEBUG=true
-APP_URL=http://snipe-it.localapp
-DB_CONNECTION=mysql
-DB_DEFAULT=mysql
-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
@@ -1,19 +0,0 @@
-APP_ENV=testing
-APP_DEBUG=true
-APP_URL=http://snipe-it.localapp
-DB_CONNECTION=sqlite_testing
-DB_DEFAULT=sqlite_testing
-DB_HOST=localhost
-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
@@ -1,22 +0,0 @@
-# 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
@@ -1,38 +0,0 @@
-#### 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)
-
-----
-#### Provide answers to these questions:
-
- Is this a fresh install or an upgrade? 
- Version of Snipe-IT you're running
- Version of PHP you're running
- Version of MySQL/MariaDB 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 reproducible on the demo: https://snipeitapp.com/demo.
- Include any additional information you can find in `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
-
-Please do not post an issue without answering the related questions above. If you have opened a different issue and already answered these questions, answer them again, once for every ticket. It will be next to impossible for us to help you.
-
-https://snipe-it.readme.io/docs/getting-help
@@ -1,61 +0,0 @@
---
-name: Bug report
-about: Create a report to help us improve
-
---
-
-#### 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)
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Server (please complete the following information):**
- - Snipe-IT Version 
- - OS: [e.g. Ubuntu, CentOS]
- - Web Server: [e.g. Apache, IIS]
- - PHP Version 
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Error Messages**
- WITH DEBUG TURNED ON, if you're getting an error in your browser, include that 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 reproducible on the demo: https://snipeitapp.com/demo.
- Include any additional information you can find in `storage/logs` and your webserver's logs.
-
-**Additional context**
- Is this a fresh install or an upgrade? 
- 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)
- 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
-
-Add any other context about the problem here.
-
-Please do not post an issue without answering the related questions above. If you have opened a different issue and already answered these questions, answer them again, once for every ticket. It will be next to impossible for us to help you.
@@ -1,23 +0,0 @@
---
-name: Feature request
-about: Suggest an idea for this project
-
---
-
-**Server (please complete the following information):**
- - Snipe-IT Version 
- - OS: [e.g. Ubuntu, CentOS]
- - Web Server: [e.g. Apache, IIS]
- - PHP Version 
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
@@ -1,20 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-  - :woman_technologist: ready for dev
-  - :moneybag: bounty
-  - :hand: bug
-# Label to use when marking an issue as stale
-staleLabel: stale
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions!
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
@@ -1 +0,0 @@
-memory_limit= 2048M
@@ -1,52 +1,16 @@
-.couscous
-.DS_Store
-.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
-public/uploads/logo.svg
-public/uploads/models/*
-public/uploads/suppliers/*
-public/uploads/accessories/*
-public/uploads/locations/*
-public/uploads/manufacturers/*
-public/uploads/components/*
-public/uploads/consumables/*
-public/uploads/companies/*
-public/uploads/categories/*
-public/uploads/users/*
-storage/app/private_uploads/users/*
-public/uploads/departments/*
-storage/debugbar/
-storage/dumps/*
-storage/laravel-backups
-storage/logs/*
-storage/private_uploads/users/*
-tests/_data/scenarios
-tests/_output/*
-tests/_support/_generated/*
-/npm-debug.log
-/storage/oauth-private.key
-/storage/oauth-public.key
-
-*.cache
+.DS_Store
+/app/config/database.php
+/app/config/mail.php
+/app/database/*.sqlite
+/app/storage/meta/services.json
+/app/config/*/mail.php
+/app/config/*/database.php
+/app/config/*/app.php
+public/packages/*
+/app/storage/views/*
+/app/storage/logs/*
+/app/storage/debugbar/
+/bin/
@@ -1,11 +0,0 @@
-<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,79 +1,34 @@
-addons:
-    code_climate:
-      repo_token:
-        secure: "C/bUAEpwfZB82dkzI2Nxx3PW5w/BzbKkSyCkp6YjT046jD2/QKvz6ngCFlt3tAWV11TXWFI6D8DzkMmdWOrQl3SGlPZXRD8QOvCiz0HiGMDvlxjAaPaQecGaQZdx/H4m6xTUXRNUVaYmxlMgkkFCWhAp+HZDs0iyOEVamp0Jszg="
-    hosts:
-        - 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
-  - 7.0
-  - 7.2 
-  - 7.1.4
+
+# optionally specify a list of environments, for example to test different RDBMS
+env:
+  - DB=mysql

 # execute any number of scripts before the test run, custom env's are available as variables
 before_script:
-  - phpenv config-add .github/travis-memory.ini
-  - 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 -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
-
-
+  - if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS snipeit_laravel;" -utravis; fi
+  - curl -s http://getcomposer.org/installer | php
+  - cp app/config/production/database.example.php app/config/database.php
+  - cp app/config/production/mail.example.php app/config/mail.php
+  - composer install --prefer-source --no-interaction --dev
+  - php artisan key:generate
+  - php artisan migrate:install
+  - php artisan migrate --package cartalyst/sentry
+  - php artisan migrate
+  - php artisan db:seed

 # omitting "script:" will default to phpunit
 # use the $DB env variable to determine the phpunit.xml to use
-# script: ./vendor/bin/codecept run --env testing-ci
-script:
-  - ./vendor/bin/codecept run unit
-#  - ./vendor/bin/codecept run acceptance --env=testing-ci
-  - ./vendor/bin/codecept run functional --env=functional-travis -g func1
-  - ./vendor/bin/codecept run functional --env=functional-travis -g func2
-  - ./vendor/bin/codecept run api --env=functional-travis
-
-after_script:
-  - vendor/bin/test-reporter
-
-after_success:
-  - codecov
-
-after_failure:
-  - cat tests/_output/*.fail.html
-  - curl http://localhost:8000/login
-  - cat storage/logs/laravel.log
+script: phpunit

 # configure notifications (email, IRC, campfire etc)
 notifications:
-  email: false
  slack:
    secure: vv9we1RxB9RsrMbomSdq6D7vz/okobw87pEkgIZjB+hj1QpQ2by90gsPsOa+NgsJEFaEP7e4KlT6SH8kK+zhbmuKaUd3d1//XdcancE22LZXi6tkiB5yuR/Jhhb1LLDqyGJTB4D92hMnnCPiUjpxNA3r437ttNeYRdYIEEP3drA=
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/5e136eb0c1965f3918d0
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: change  # options: [always|never|change] default: always
-    on_start: false     # default: false
@@ -0,0 +1,137 @@
+
+
+###  v0.3.11-alpha - Released Jul 19, 2014 07:16:53
+#### This is a pre-release 
+
+
+###  v0.3.10-alpha - Released Jul 17, 2014 07: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 04:08:38
+#### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/2825bcb4310899e89ccbc73dfa8b59ade28018da">view</a> &bull; Fixed #179 - account page to show assets checked out to the logged in user 
+* <a href="http://github.com/snipe/snipe-it/commit/c782f29f5aae752a6246be9778d418df172dd4f6">view</a> &bull; Pulled account sub-nav into top menu to free up UI space. #changelog 
+* <a href="http://github.com/snipe/snipe-it/commit/fad2ec66fa9abe0b34baf16cce453a7e9fc9e4d4">view</a> &bull; More README fixes and refinement 
+
+
+###  v0.3.8-alpha - Released Jun 27, 2014 11:28:22
+#### 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 04:23:09
+#### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/d1499deecdff3c7a4235ffdfad5adbddc1a5098f">view</a> &bull; Provisions for strict mode, fixed license deletion bug 
+
+
+###  v.0.3.4-alpha - Released Jun 20, 2014 12:27:59
+#### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/08d05b481f6366ad48fcdce72a8df53755f5dee8">view</a> &bull; Fixes #158 
+
+
+###  v.0.3.3-alpha - Released Jun 18, 2014 10:04:46
+#### 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 10:26:21
+#### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/f4c5da57d0397877d90aa398267e59fcffee7b47">view</a> &bull; Fixed auth error when user isn't logged in 
+
+
+###  v.0.3.1-alpha - Released May 06, 2014 06:48:09
+#### 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 02: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 11: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 02: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/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 
+
+
+###  v0.1.1-alpha - Released Nov 27, 2013 12: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 
@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-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.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* 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
-
-Examples of unacceptable behavior by participants include:
-
-* 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 abuse@snipeitapp.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-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,6 +1,25 @@
-### Contributing
+# Contribution Guidelines

-Please see the documentation on [contributing and developing for Snipe-IT](https://snipe-it.readme.io/docs/contributing-overview).
+Please submit all issues and 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.

-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.
+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.
+
+-----
+
+## Translations!
+
+If you're not great at PHP and you still want to help, consider contributing some translation files (assuming, of course, that you are fluent in another language.)
+
+To do so:
+
+* fork the develop branch
+* create a new branch on your new fork (something like `translations/french`)
+* copy the `en` directory and name it according to the [two-letter ISO 639-1 code](http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)
+* translate the strings
+* submit a pull request!
+
+**If you've translated Snipe IT into another language already for your own usage, please consider contributing those translation files back to the project so that everyone can benefit.**
+
+Thanks!
@@ -1,109 +0,0 @@
-FROM ubuntu:xenial
-MAINTAINER Brady Wetherington <uberbrady@gmail.com>
-
-RUN apt-get update && apt-get install -y \
-apache2 \
-apache2-bin \
-libapache2-mod-php7.0 \
-php7.0-curl \
-php7.0-ldap \
-php7.0-mysql \
-php7.0-mcrypt \
-php7.0-gd \
-php7.0-xml \
-php7.0-mbstring \
-php7.0-zip \
-php7.0-bcmath \
-patch \
-curl \
-vim \
-git \
-mysql-client \
-&& apt-get clean \
-&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-RUN phpenmod mcrypt
-RUN phpenmod gd
-RUN phpenmod bcmath
-
-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 -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 #####################
-
-WORKDIR /var/www/html
-
-#Append to bootstrap file (less brittle than 'patch')
-# RUN sed -i 's/return $app;/$env="production";\nreturn $app;/' bootstrap/start.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" \
-      && mkdir "/var/lib/snipeit/keys" && ln -fs "/var/lib/snipeit/keys/oauth-private.key" "/var/www/html/storage/oauth-private.key" \
-      && ln -fs "/var/lib/snipeit/keys/oauth-public.key" "/var/www/html/storage/oauth-public.key" \
-      && chown docker "/var/lib/snipeit/keys/"
-
-############## 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
-USER docker
-RUN cd /var/www/html;composer install && rm -rf /home/docker/.composer/cache
-USER root
-
-############### APPLICATION INSTALL/INIT #################
-
-#RUN php artisan app:install
-# too interactive! Try something else
-
-#COPY docker/app_install.exp /tmp/app_install.exp
-#RUN chmod +x /tmp/app_install.exp
-#RUN /tmp/app_install.exp
-
-############### DATA VOLUME #################
-
-VOLUME ["/var/lib/snipeit"]
-
-##### START SERVER
-
-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,104 +1,52 @@
-[![Build Status](https://travis-ci.org/snipe/snipe-it.svg?branch=master)](https://travis-ci.org/snipe/snipe-it) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/snipe/snipe-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeyhead.svg?style=social)](https://twitter.com/snipeyhead)  [![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-99-orange.svg?style=flat-square)](#contributors) [![Open Source Helpers](https://www.codetriage.com/snipe/snipe-it/badges/users.svg)](https://www.codetriage.com/snipe/snipe-it)
+[![Click here to lend your support to: Snipe IT - Free Open Source Asset Management System and make a donation at pledgie.com](https://pledgie.com/campaigns/22899.png?skin_name=chrome)](https://pledgie.com/campaigns/22899) [![Build Status](https://travis-ci.org/snipe/snipe-it.svg?branch=develop)](https://travis-ci.org/snipe/snipe-it) [![Stories in Ready](https://badge.waffle.io/snipe/snipe-it.png?label=ready&title=Ready)](http://waffle.io/snipe/snipe-it) [![ProjectStatus](http://stillmaintained.com/snipe/snipe-it.png)](http://stillmaintained.com/snipe/snipe-it)


-## Snipe-IT - Open Source Asset Management System
+## Snipe-IT - Asset Management For the Rest of Us

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

-It is built on [Laravel 5.4](http://laravel.com).
+It is built on [Laravel 4.1](http://laravel.com) and uses the [Sentry 2](https://github.com/cartalyst/sentry) package.

-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 project is being actively developed (at what seems like breakneck speed sometimes!) We're still in alpha release, so this is NOT recommended for production use yet, as many more things will likely change before v1.0-stable is ready - but we're [releasing quite frequently](https://github.com/snipe/snipe-it/releases). ([Check out the live demo here](http://snipeitapp.com/demo.php).)

-__This 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.
+__This is web-based software__. This means there there is no executable file (aka no .exe files), and it must be run on a web server and accessed through a web browser. It runs on any Mac OSX, flavor of Linux, as well as Windows.

 -----
+### Documentation & Installation

-### Installation
+__Installation and configuration documentation for this project has been moved to http://docs.snipeitapp.com.__ This provides a more easily navigated, organized view of the documentation, and is based off of the [documentation branch](https://github.com/snipe/snipe-it/tree/documentation) in this repo. Contributions and bugfixes to the documentation are always welcome!

-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.)
+We'll be adding a long-overdue user's manual soon as well.

-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.
-
-----
-### User's Manual
-For help using Snipe-IT, check out the [user's manual](https://snipe-it.readme.io/docs/overview).
+__To deploy on Ubuntu using Ansible and Vagrant, be sure to check out the [Snipe-IT Installation scripts](https://github.com/GR360RY/snipeit-ansible) created by [@GR360RY](https://github.com/GR360RY/).__

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

-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.
+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.

-**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.**
+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)

 -----
-
-### Upgrading
-
-Please see the [upgrading documentation](https://snipe-it.readme.io/docs/upgrading) for instructions on upgrading Snipe-IT.
-
------
 ### Announcement List

 To be notified of important news (such as new releases, security advisories, etc), [sign up for our list](http://eepurl.com/XyZKz). We'll never sell or give away your info, and we'll only email you when it's important.

------
+-----
+## Requirements

-### Translations!
-
-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.
+- PHP 5.4 or later
+- MCrypt PHP Extension

 -----

-### Libraries, Modules & Related Projects
+## Important Notes on Updating

-Since the release of the JSON REST API, several third-party developers have been developing modules and libraries to work with Snipe-IT.  
+Whenever you pull down a new version from master or develop, when you grab the [latest official release](https://github.com/snipe/snipe-it/releases), make sure to run the following commands via command line:

- [Python Module](https://github.com/jbloomer/SnipeIT-PythonAPI) by [@jbloomer](https://github.com/jbloomer)
- [SnipeSharp - .NET module in C#](https://github.com/barrycarey/SnipeSharp) by [@barrycarey](https://github.com/barrycarey)
- [InQRy](https://github.com/Microsoft/InQRy) by [@Microsoft](https://github.com/Microsoft)
- [SnipeitPS](https://github.com/snazy2000/SnipeitPS) by [@snazy2000](https://github.com/snazy2000) - Powershell API Wrapper for Snipe-it
+	php composer.phar dump-autoload
+	php artisan migrate

-As these were created by third-parties, Snipe-IT cannot provide support for these project, and you should contact the developers directly if you need assistance. Additionally, Snipe-IT makes no guarantees as to the reliability, accuracy or maintainability of these libraries. Use at your own risk. :) 
-
-----
-
-### 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") | [<img src="https://avatars0.githubusercontent.com/u/3697569?v=4" width="110px;"/><br /><sub>gizzmojr</sub>](https://github.com/gizzmojr)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gizzmojr "Code") | [<img src="https://avatars3.githubusercontent.com/u/404729?v=4" width="110px;"/><br /><sub>Jenny Li</sub>](https://github.com/imjennyli)<br />[📖](https://github.com/snipe/snipe-it/commits?author=imjennyli "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/869227?v=4" width="110px;"/><br /><sub>Geoff Young</sub>](https://github.com/GeoffYoung)<br />[💻](https://github.com/snipe/snipe-it/commits?author=GeoffYoung "Code") | [<img src="https://avatars3.githubusercontent.com/u/1068477?v=4" width="110px;"/><br /><sub>Elliot Blackburn</sub>](http://www.elliotblackburn.com)<br />[📖](https://github.com/snipe/snipe-it/commits?author=BlueHatbRit "Documentation") |
-| [<img src="https://avatars1.githubusercontent.com/u/6357451?v=4" width="110px;"/><br /><sub>Tõnis Ormisson</sub>](http://andmemasin.eu)<br />[💻](https://github.com/snipe/snipe-it/commits?author=TonisOrmisson "Code") | [<img src="https://avatars0.githubusercontent.com/u/449411?v=4" width="110px;"/><br /><sub>Nicolai Essig</sub>](http://www.nicolai-essig.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=thakilla "Code") | [<img src="https://avatars1.githubusercontent.com/u/14809698?v=4" width="110px;"/><br /><sub>Danielle</sub>](https://github.com/techincolor)<br />[📖](https://github.com/snipe/snipe-it/commits?author=techincolor "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/18545156?v=4" width="110px;"/><br /><sub>Lawrence</sub>](https://github.com/TheVakman)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=TheVakman "Tests") [🐛](https://github.com/snipe/snipe-it/issues?q=author%3ATheVakman "Bug reports") | [<img src="https://avatars1.githubusercontent.com/u/22473767?v=4" width="110px;"/><br /><sub>uknzaeinozpas</sub>](https://github.com/uknzaeinozpas)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=uknzaeinozpas "Tests") [💻](https://github.com/snipe/snipe-it/commits?author=uknzaeinozpas "Code") | [<img src="https://avatars3.githubusercontent.com/u/422752?v=4" width="110px;"/><br /><sub>Ryan</sub>](https://github.com/Gelob)<br />[📖](https://github.com/snipe/snipe-it/commits?author=Gelob "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/10672546?v=4" width="110px;"/><br /><sub>vcordes79</sub>](https://github.com/vcordes79)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vcordes79 "Code") |
-| [<img src="https://avatars3.githubusercontent.com/u/27958330?v=4" width="110px;"/><br /><sub>fordster78</sub>](https://github.com/fordster78)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fordster78 "Code") | [<img src="https://avatars0.githubusercontent.com/u/34064225?v=4" width="110px;"/><br /><sub>CronKz</sub>](https://github.com/CronKz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=CronKz "Code") | [<img src="https://avatars1.githubusercontent.com/u/585486?v=4" width="110px;"/><br /><sub>Tim Bishop</sub>](https://github.com/tdb)<br />[💻](https://github.com/snipe/snipe-it/commits?author=tdb "Code") | [<img src="https://avatars2.githubusercontent.com/u/5384694?v=4" width="110px;"/><br /><sub>Sean McIlvenna</sub>](https://www.seanmcilvenna.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=seanmcilvenna "Code") | [<img src="https://avatars3.githubusercontent.com/u/36515590?v=4" width="110px;"/><br /><sub>cepacs</sub>](https://github.com/cepacs)<br />[🐛](https://github.com/snipe/snipe-it/issues?q=author%3Acepacs "Bug reports") [📖](https://github.com/snipe/snipe-it/commits?author=cepacs "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/37537300?v=4" width="110px;"/><br /><sub>lea-mink</sub>](https://github.com/lea-mink)<br />[💻](https://github.com/snipe/snipe-it/commits?author=lea-mink "Code") | [<img src="https://avatars0.githubusercontent.com/u/7140719?v=4" width="110px;"/><br /><sub>Hannah Tinkler</sub>](https://github.com/hannahtinkler)<br />[💻](https://github.com/snipe/snipe-it/commits?author=hannahtinkler "Code") |
-| [<img src="https://avatars1.githubusercontent.com/u/1086388?v=4" width="110px;"/><br /><sub>Doeke Zanstra</sub>](https://github.com/doekman)<br />[💻](https://github.com/snipe/snipe-it/commits?author=doekman "Code") |
-<!-- ALL-CONTRIBUTORS-LIST:END -->
-
-This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
-
-----
-
-### Contributing
-
-Please see the documentation on [contributing and developing for Snipe-IT](https://snipe-it.readme.io/docs/contributing-overview).
-
-
-Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
-
-----
-
-### Security
-
-To report a security vulnerability, please email security@snipeitapp.com instead of using the issue tracker. 
+Forgetting to do this can mean your DB might end up out of sync with the new files you just pulled, or you may have some funky cached autoloader values. It's a good idea to get into the habit of running these every time you pull anything new down. If there are no database changes to migrate, it won't hurt anything to run migrations anyway.
@@ -1,76 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-SNIPEIT_SH_URL= "https://raw.githubusercontent.com/snipe/snipe-it/master/snipeit.sh"
-NETWORK_BRIDGE= "en0: Wi-Fi (AirPort)"
-
-Vagrant.configure("2") do |config|
-  config.vm.define "xenial" do |xenial|
-    xenial.vm.box = "ubuntu/xenial64"
-    xenial.vm.hostname = 'xenial'
-    xenial.vm.network "public_network", bridge: NETWORK_BRIDGE
-    xenial.vm.provision :shell, :inline => "wget #{SNIPEIT_SH_URL}"
-    xenial.vm.provision :shell, :inline => "chmod 755 snipeit.sh"
-  end
-
-  config.vm.define "trusty" do |trusty|
-    trusty.vm.box = "ubuntu/trusty32"
-    trusty.vm.hostname = 'trusty'
-    trusty.vm.network "public_network", bridge: NETWORK_BRIDGE
-    trusty.vm.provision :shell, :inline => "wget #{SNIPEIT_SH_URL}"
-    trusty.vm.provision :shell, :inline => "chmod 755 snipeit.sh"
-  end
-
-  config.vm.define "centos7" do |centos7|
-    centos7.vm.box = "centos/7"
-    centos7.vm.hostname = 'centos7'
-    centos7.vm.network "public_network", bridge: NETWORK_BRIDGE
-    centos7.vm.provision :shell, :inline => "sudo yum -y update"
-    centos7.vm.provision :shell, :inline => "yum install -y wget"
-    centos7.vm.provision :shell, :inline => "wget #{SNIPEIT_SH_URL}"
-    centos7.vm.provision :shell, :inline => "chmod 755 snipeit.sh"
-  end
-
-  config.vm.define "centos6" do |centos6|
-    centos6.vm.box = "centos/6"
-    centos6.vm.hostname = 'centos6'
-    centos6.vm.network "public_network", bridge: NETWORK_BRIDGE
-    centos6.vm.provision :shell, :inline => "sudo yum -y update"
-    centos6.vm.provision :shell, :inline => "wget #{SNIPEIT_SH_URL}"
-    centos6.vm.provision :shell, :inline => "chmod 755 snipeit.sh"
-  end
-
-  config.vm.define "jessie" do |jessie|
-    jessie.vm.box = "debian/jessie64"
-    jessie.vm.hostname = 'debian8'
-    jessie.vm.network "public_network", bridge: NETWORK_BRIDGE
-    jessie.vm.provision :shell, :inline => "wget #{SNIPEIT_SH_URL}"
-    jessie.vm.provision :shell, :inline => "chmod 755 snipeit.sh"
-  end
-
-  config.vm.define "stretch" do |stretch|
-    stretch.vm.box = "debian/stretch64"
-    stretch.vm.hostname = 'debian9'
-    stretch.vm.network "public_network", bridge: NETWORK_BRIDGE
-    stretch.vm.provision :shell, :inline => "wget #{SNIPEIT_SH_URL}"
-    stretch.vm.provision :shell, :inline => "chmod 755 snipeit.sh"
-  end
-
-  config.vm.define "fedora27" do |fedora27|
-    fedora27.vm.box = "fedora/27-cloud-base"
-    fedora27.vm.hostname = 'fedora27'
-    fedora27.vm.network "public_network", bridge: NETWORK_BRIDGE
-    fedora27.vm.provision :shell, :inline => "dnf -y install wget"
-    fedora27.vm.provision :shell, :inline => "wget #{SNIPEIT_SH_URL}"
-    fedora27.vm.provision :shell, :inline => "chmod 755 snipeit.sh"
-  end
-
-    config.vm.define "fedora26" do |fedora26|
-    fedora26.vm.box = "fedora/26-cloud-base"
-    fedora26.vm.hostname = 'fedora26'
-    fedora26.vm.network "public_network", bridge: NETWORK_BRIDGE
-    fedora26.vm.provision :shell, :inline => "dnf -y install wget"
-    fedora26.vm.provision :shell, :inline => "wget #{SNIPEIT_SH_URL}"
-    fedora26.vm.provision :shell, :inline => "chmod 755 snipeit.sh"
-  end
-end
@@ -1,85 +0,0 @@
-<?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'),
-  // 		);
-    // }
-}
@@ -1,56 +0,0 @@
-<?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.');
-        }
-
-    }
-}
@@ -1,85 +0,0 @@
-<?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');
-
-    }
-}
@@ -1,238 +0,0 @@
-<?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=} {--base_dn=} {--summary} {--json_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();
-            Ldap::bindAdminToLdap($ldapconn);
-        } catch (\Exception $e) {
-            if ($this->option('json_summary')) {
-                $json_summary = [ "error" => true, "error_message" => $e->getMessage(), "summary" => [] ];
-                $this->info(json_encode($json_summary));
-            }
-            LOG::error($e);
-            return [];
-        }
-
-        $summary = array();
-
-        try {    
-            if ($this->option('base_dn') != '') {
-                $search_base = $this->option('base_dn');
-                LOG::debug('Importing users from specified base DN: \"'.$search_base.'\".');                
-            } else {
-                $search_base = null;
-            }
-            $results = Ldap::findLdapUsers($search_base);
-        } catch (\Exception $e) {
-            if ($this->option('json_summary')) {
-                $json_summary = [ "error" => true, "error_message" => $e->getMessage(), "summary" => [] ];
-                $this->info(json_encode($json_summary));
-            }
-            LOG::error($e);
-            return [];
-        }
-
-        /* Determine which location to assign users to by default. */
-        $location = NULL;
-
-        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.')');
-        }
-
-        if (!isset($location)) {
-            LOG::debug('That location is invalid or a location was not provided, so no location will be assigned by default.');
-        }
-
-        /* Process locations with explicitly defined OUs, if doing a full import. */
-        if ($this->option('base_dn')=='') {
-            // Retrieve locations with a mapped OU, and sort them from the shallowest to deepest OU (see #3993)
-            $ldap_ou_locations = Location::where('ldap_ou', '!=', '')->get()->toArray();
-            $ldap_ou_lengths = array();
-            
-            foreach ($ldap_ou_locations as $location) {
-                $ldap_ou_lengths[] = strlen($location["ldap_ou"]);
-            }
-
-            array_multisort($ldap_ou_lengths, SORT_ASC, $ldap_ou_locations);
-
-            if (sizeof($ldap_ou_locations) > 0) {
-                LOG::debug('Some locations have special OUs set. Locations will be automatically set for users in those OUs.');
-            }
-
-            // Inject location information fields
-            for ($i = 0; $i < $results["count"]; $i++) {
-                $results[$i]["ldap_location_override"] = false;
-                $results[$i]["location_id"] = 0;
-            }
-
-            // Grab subsets based on location-specific DNs, and overwrite location for these users.
-            foreach ($ldap_ou_locations as $ldap_loc) {
-                $location_users = Ldap::findLdapUsers($ldap_loc["ldap_ou"]);
-                $usernames = array();
-                for ($i = 0; $i < $location_users["count"]; $i++) {
-                    $location_users[$i]["ldap_location_override"] = true;
-                    $location_users[$i]["location_id"] = $ldap_loc["id"];
-                    $usernames[] = $location_users[$i][$ldap_result_username][0];
-                }
-
-                // Delete located users from the general group.
-                foreach ($results as $key => $generic_entry) {
-                    if (in_array($generic_entry[$ldap_result_username][0], $usernames)) {
-                        unset($results[$key]);
-                    }
-                }
-
-                $global_count = $results['count'];
-                $results = array_merge($location_users, $results);
-                $results['count'] = $global_count;
-            }
-        }
-
-        /* Create user account entries in Snipe-IT */
-        $tmp_pass = substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 20);
-        $pass = bcrypt($tmp_pass);
-
-        for ($i = 0; $i < $results["count"]; $i++) {
-            if (empty($ldap_result_active_flag) || $results[$i][$ldap_result_active_flag][0] == "TRUE") {
-
-                $item = array();
-                $item["username"] = isset($results[$i][$ldap_result_username][0]) ? $results[$i][$ldap_result_username][0] : "";
-                $item["employee_number"] = isset($results[$i][$ldap_result_emp_num][0]) ? $results[$i][$ldap_result_emp_num][0] : "";
-                $item["lastname"] = isset($results[$i][$ldap_result_last_name][0]) ? $results[$i][$ldap_result_last_name][0] : "";
-                $item["firstname"] = isset($results[$i][$ldap_result_first_name][0]) ? $results[$i][$ldap_result_first_name][0] : "";
-                $item["email"] = isset($results[$i][$ldap_result_email][0]) ? $results[$i][$ldap_result_email][0] : "" ;
-                $item["ldap_location_override"] = isset($results[$i]["ldap_location_override"]) ? $results[$i]["ldap_location_override"]:"";
-                $item["location_id"] = isset($results[$i]["location_id"]) ? $results[$i]["location_id"]:"";
-
-                if ( array_key_exists('useraccountcontrol', $results[$i]) ) {
-                    $enabled_accounts = [
-                        '512', '544', '66048', '66080', '262656', '262688', '328192', '328224'
-                    ];
-                    $item['activated'] = ( in_array($results[$i]['useraccountcontrol'][0], $enabled_accounts) ) ? 1 : 0;
-                } else {
-                    $item['activated'] = 0;
-                }
-
-                // User exists
-                $item["createorupdate"] = 'updated';
-                if (!$user = User::where('username', $item["username"])->first()) {
-                    $user = new User;
-                    $user->password = $pass;
-                    $item["createorupdate"] = 'created';
-                }
-
-                // Create the user if they don't exist.
-                $user->first_name = 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 = $item['activated'];
-
-                if ($item['ldap_location_override'] == true) {
-                    $user->location_id = $item['location_id'];
-                } elseif ((isset($location)) && (!empty($location))) {
-
-                    if ((is_array($location)) && (array_key_exists('id', $location))) {
-                        $user->location_id = $location['id'];
-                    } elseif (is_object($location)) {
-                        $user->location_id = $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 if ($this->option('json_summary')) {
-            $json_summary = [ "error" => false, "error_message" => "", "summary" => $summary ];
-            $this->info(json_encode($json_summary));
-        } else {
-            return $summary;
-        }
-    }
-}
@@ -1,178 +0,0 @@
-<?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);
-        $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'),
-        );
-
-    }
-}
@@ -1,142 +0,0 @@
-<?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');
-            }
-        }
-    }
-}
@@ -1,178 +0,0 @@
-<?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.');
-        }
-
-    }
-}
@@ -1,167 +0,0 @@
-<?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 
-                {--force : Force a re-crypt of encrypted data from MCRYPT.}';
-
-    /**
-     * 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);
-        $legacy_cipher = env('LEGACY_CIPHER', 'rijndael-256');
-        $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_key = base64_decode($key_parts[1],true);
-            $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.");
-
-        $force = ($this->option('force')) ? true : false;
-
-        if ($force || ($this->confirm("Are you SURE you wish to continue?"))) {
-
-            $backup_file = 'backups/env-backups/'.'app_key-'.date('Y-m-d-gis');
-
-            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');
-            }
-
-
-            if ($legacy_cipher){
-                $mcrypter = new McryptEncrypter($legacy_key,$legacy_cipher);
-            }else{
-                $mcrypter = new McryptEncrypter($legacy_key);
-            }
-            $settings = Setting::getSettings();
-
-            if ($settings->ldap_pword=='') {
-                $this->comment('INFO: No LDAP password found. Skipping... ');
-            } else {
-                $decrypted_ldap_pword = $mcrypter->decrypt($settings->ldap_pword);
-                $settings->ldap_pword = \Crypt::encrypt($decrypted_ldap_pword);
-                $settings->save();
-            }
-            /** @var CustomField[] $custom_fields */
-            $custom_fields = CustomField::where('field_encrypted','=', 1)->get();
-            $this->comment('INFO: Retrieving encrypted custom fields...');
-
-            $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
-            /** @var Asset[] $assets */
-            $assets = $query->get();
-
-            $bar = $this->output->createProgressBar(count($assets));
-
-
-            foreach ($assets as $asset) {
-                foreach ($custom_fields as $encrypted_field) {
-                    $columnName = $encrypted_field->db_column;
-
-                    // Make sure the value isn't null
-                    if ($asset->{$columnName}!='') {
-                        // Try to decrypt the payload using the legacy app key
-                        try {
-                            $decrypted_field = $mcrypter->decrypt($asset->{$columnName});
-                            $asset->{$columnName} = \Crypt::encrypt($decrypted_field);
-                            $this->comment($decrypted_field);
-                        } catch (\Exception $e) {
-                            $errors[] = ' - ERROR: Could not decrypt field ['.$encrypted_field->name.']: '.$e->getMessage();
-                        }
-                    }
-
-                }
-                $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);
-                }
-            }
-        }
-
-    }
-}
@@ -1,105 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-use App\Models\Asset;
-use App\Models\Setting;
-use DB;
-use Artisan;
-
-class RegenerateAssetTags extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:regenerate-tags {--start=} {--output= : info|warn|error|all} ';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'This utility will regenerate all asset tags. THIS IS DATA-DESTRUCTIVE AND SHOULD BE USED WITH CAUTION. ';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-
-        if ($this->confirm('This will regenerate all of the asset tags within your system. This action is data-destructive and should be used with caution. Do you wish to continue?'))
-        {
-
-            $output['info'] = [];
-            $output['warn'] = [];
-            $output['error'] = [];
-            $settings = Setting::getSettings();
-
-            $start_tag = ($this->option('start')) ? $this->option('start') : (($settings->next_auto_tag_base) ? Setting::getSettings()->next_auto_tag_base : 1) ;
-
-            $this->info('Starting at '.$start_tag);
-
-            $total_assets = Asset::orderBy('id','asc')->get();
-            $bar = $this->output->createProgressBar(count($total_assets));
-
-            try  {
-                Artisan::call('backup:run');
-            } catch (\Exception $e) {
-                $output['error'][] = $e;
-            }
-
-            foreach ($total_assets as $asset) {
-                
-                $start_tag++;
-                $output['info'][] = 'Asset tag:'.$asset->asset_tag;
-                $asset->asset_tag = $settings->auto_increment_prefix.$settings->auto_increment_prefix.$start_tag;
-
-                if ($settings->zerofill_count > 0) {
-                    $asset->asset_tag = $settings->auto_increment_prefix.Asset::zerofill($start_tag, $settings->zerofill_count);
-                }
-
-                $output['info'][] = 'New Asset tag:'.$asset->asset_tag;
-
-                // Use forceSave here to override model level validation
-                $asset->forceSave();
-            }
-
-            $bar->finish();
-            $this->info("\n");
-
-
-            if (($this->option('output')=='all') || ($this->option('output')=='info')) {
-                foreach ($output['info'] as $key => $output_text) {
-                    $this->info($output_text);
-                }
-            }
-            if (($this->option('output')=='all') || ($this->option('output')=='warn')) {
-                foreach ($output['warn'] as $key => $output_text) {
-                    $this->warn($output_text);
-                }
-            }
-            if (($this->option('output')=='all') || ($this->option('output')=='error')) {
-                foreach ($output['error'] as $key => $output_text) {
-                    $this->error($output_text);
-                }
-            }
-        }
-
-
-    }
-}
@@ -1,76 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-
-use Illuminate\Console\Command;
-use App\Models\Setting;
-use App\Models\User;
-
-class ResetDemoSettings extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:demo-settings';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'This will reset the Snipe-IT demo settings back to default. ';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-
-        $this->info('Resetting the demo settings.');
-        $settings = Setting::first();
-        $settings->per_page = 20;
-        $settings->site_name = 'Snipe-IT Asset Management Demo';
-        $settings->auto_increment_assets = 1;
-        $settings->logo = 'snipe-logo.png';
-        $settings->alert_email = 'service@snipe-it.io';
-        $settings->header_color = null;
-        $settings->barcode_type = 'QRCODE';
-        $settings->default_currency = 'USD';
-        $settings->brand = 3;
-        $settings->ldap_enabled = 0;
-        $settings->full_multiple_companies_support = 1;
-        $settings->alt_barcode = 'C128';
-        $settings->skin = '';
-        $settings->email_domain = 'snipeitapp.com';
-        $settings->email_format = 'filastname';
-        $settings->username_format = 'filastname';
-        $settings->date_display_format = 'D M d, Y';
-        $settings->time_display_format = 'g:iA';
-        $settings->thumbnail_max_h = '30';
-        $settings->locale = 'en';
-        $settings->save();
-
-        if ($user = User::where('username', '=', 'admin')->first()) {
-            $user->locale = 'en';
-            $user->save();
-        }
-
-        
-    }
-
-}
@@ -1,73 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-
-use App\Models\Asset;
-use App\Models\Setting;
-use Illuminate\Console\Command;
-use App\Notifications\ExpectedCheckinNotification;
-use App\Notifications\ExpectedCheckinAdminNotification;
-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()
-    {
-        $settings = Setting::getSettings();
-        $whenNotify = Carbon::now()->addDays(7);
-        $assets = Asset::with('assignedTo')->whereNotNull('assigned_to')->whereNotNull('expected_checkin')->where('expected_checkin', '<=', $whenNotify)->get();
-
-        $this->info($whenNotify.' is deadline');
-        $this->info($assets->count().' assets');
-
-        foreach ($assets as $asset) {
-            if ($asset->assigned  && $asset->checkedOutToUser()) {
-                $asset->assigned->notify((new ExpectedCheckinNotification($asset)));
-            }
-        }
-
-
-        // Send a rollup to the admin, if settings dictate
-        $recipient = new \App\Models\Recipients\AlertRecipient();
-
-        if ($settings->alert_email!='') {
-            $recipient->notify(new ExpectedCheckinAdminNotification($assets));
-        }
-
-
-
-
-
-    }
-}
@@ -1,137 +0,0 @@
-<?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'] =  $expiring_licenses->count();
-        $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";
-            }
-
-        }
-
-
-
-
-    }
-}
@@ -1,69 +0,0 @@
-<?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";
-            }
-        }
-
-
-    }
-}
@@ -1,76 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-use App\Models\Asset;
-
-class SyncAssetCounters extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:counter-sync';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Syncs checkedout, checked in, and requested counters for assets';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        $start = microtime(true);
-        $assets = Asset::withCount('checkins', 'checkouts', 'userRequests')
-            ->withTrashed()->get();
-
-        if ($assets) {
-            if ($assets->count() > 0) {
-                $bar = $this->output->createProgressBar($assets->count());
-                
-                foreach ($assets as $asset) {
-                    $asset->checkin_counter = (int) $asset->checkins_count;
-                    $asset->checkout_counter = (int) $asset->checkouts_count;
-                    $asset->requests_counter = (int) $asset->user_requests_count;
-                    $asset->unsetEventDispatcher();
-                    $asset->save();
-                    $output['info'][] = 'Asset: ' . $asset->id . ' has ' . $asset->checkin_counter . ' checkins, ' . $asset->checkout_counter . ' checkouts, and ' . $asset->requests_counter . ' requests';
-                    $bar->advance();
-                }
-                $bar->finish();
-
-                foreach ($output['info'] as $key => $output_text) {
-                    $this->info($output_text);
-                }
-
-                $time_elapsed_secs = microtime(true) - $start;
-                $this->info('Sync executed in ' . $time_elapsed_secs . ' seconds');
-
-            } else {
-                $this->info('No assets to sync');
-            }
-
-        }
-
-
-
-    }
-}
@@ -1,148 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Models\CustomField;
-use Illuminate\Console\Command;
-use App\Models\Asset;
-use Illuminate\Support\Facades\Storage;
-
-class SyncAssetLocations extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:sync-asset-locations {--output= : info|warn|error|all} ';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'This utility will sync the location_id of assets based on current state. It should not normally be needed, but is a safeguard in case we missed something in the Great Migration when flattening the assets to location relationship.';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-
-        $output['info'] = [];
-        $output['warn'] = [];
-        $output['error'] = [];
-
-        $total_assets = Asset::whereNull('deleted_at')->get();
-        $bar = $this->output->createProgressBar(count($total_assets));
-
-        // Unassigned
-        $rtd_assets = Asset::whereNull('assigned_to')->whereNull('deleted_at')->with('defaultLoc')->get();
-        $output['info'][] = 'There are '.$rtd_assets->count().' unassigned assets.';
-
-        foreach ($rtd_assets as $rtd_asset) {
-             $output['info'][] = 'Setting Unassigned Asset ' . $rtd_asset->id . ' ('.$rtd_asset->asset_tag.') to  location: ' . $rtd_asset->rtd_location_id . " because their default location is: " . $rtd_asset->rtd_location_id;
-            $rtd_asset->location_id=$rtd_asset->rtd_location_id;
-            $rtd_asset->unsetEventDispatcher();
-            $rtd_asset->save();
-            $bar->advance();
-        }
-
-        $assigned_user_assets = Asset::where('assigned_type','App\Models\User')->whereNotNull('assigned_to')->whereNull('deleted_at')->get();
-        $output['info'][] = 'There are '.$assigned_user_assets->count().' assets checked out to users.';
-        foreach ($assigned_user_assets as $assigned_user_asset) {
-            if (($assigned_user_asset->assignedTo) && ($assigned_user_asset->assignedTo->userLoc)) {
-                $new_location=$assigned_user_asset->assignedTo->userloc->id;
-                $output['info'][] ='Setting User Asset ' . $assigned_user_asset->id . ' ('.$assigned_user_asset->asset_tag.') to  ' . $assigned_user_asset->assignedTo->userLoc->name . ' which is id: ' . $new_location;
-            } else {
-                $output['warn'][] ='Asset ' . $assigned_user_asset->id . ' ('.$assigned_user_asset->asset_tag.') still has no location! ';
-                $new_location = $assigned_user_asset->rtd_location_id;
-            }
-            $assigned_user_asset->location_id=$new_location;
-            $assigned_user_asset->unsetEventDispatcher();
-            $assigned_user_asset->save();
-            $bar->advance();
-
-        }
-
-        $assigned_location_assets = Asset::where('assigned_type','App\Models\Location')
-            ->whereNotNull('assigned_to')->whereNull('deleted_at')->get();
-        $output['info'][] = 'There are '.$assigned_location_assets->count().' assets checked out to locations.';
-
-        foreach ($assigned_location_assets as $assigned_location_asset) {
-            if ($assigned_location_asset->assignedTo) {
-                $assigned_location_asset->location_id = $assigned_location_asset->assignedTo->id;
-                $output['info'][] ='Setting Location Assigned  asset ' . $assigned_location_asset->id . ' ('.$assigned_location_asset->asset_tag.') that is checked out to '.$assigned_location_asset->assignedTo->name.' (#'.$assigned_location_asset->assignedTo->id.') to location: ' . $assigned_location_asset->assetLoc()->id;
-                $assigned_location_asset->unsetEventDispatcher();
-                $assigned_location_asset->save();
-            } else {
-                $output['warn'][] ='Asset ' . $assigned_location_asset->id . ' ('.$assigned_location_asset->asset_tag.') did not return a valid associated location - perhaps it was deleted?';
-            }
-            $bar->advance();
-
-        }
-
-
-        // Assigned to assets
-        $assigned_asset_assets = Asset::where('assigned_type','App\Models\Asset')
-            ->whereNotNull('assigned_to')->whereNull('deleted_at')->get();
-            $output['info'][] ='Asset-assigned assets: '.$assigned_asset_assets->count();
-
-            foreach ($assigned_asset_assets as $assigned_asset_asset) {
-
-                // Check to make sure there aren't any invalid relationships
-                if ($assigned_asset_asset->assetLoc()) {
-                    $assigned_asset_asset->location_id = $assigned_asset_asset->assetLoc()->id;
-                    $output['info'][] ='Setting Asset Assigned asset ' . $assigned_asset_asset->assetLoc()->id. ' ('.$assigned_asset_asset->asset_tag.') location to: ' . $assigned_asset_asset->assetLoc()->id;
-                    $assigned_asset_asset->unsetEventDispatcher();
-                    $assigned_asset_asset->save();
-                } else {
-                    $output['warn'][] ='Asset Assigned asset ' . $assigned_asset_asset->id. ' ('.$assigned_asset_asset->asset_tag.') does not seem to have a valid location';
-                }
-
-                $bar->advance();
-
-            }
-
-        $unlocated_assets = Asset::whereNull("location_id")->whereNull('deleted_at')->get();
-        $output['info'][] ='Assets still without a location: '.$unlocated_assets->count();
-        foreach($unlocated_assets as $unlocated_asset) {
-            $output['warn'][] ='Asset: '.$unlocated_asset->id.' still has no location. ';
-            $bar->advance();
-        }
-
-        $bar->finish();
-        $this->info("\n");
-
-
-        if (($this->option('output')=='all') || ($this->option('output')=='info')) {
-            foreach ($output['info'] as $key => $output_text) {
-                $this->info($output_text);
-            }
-        }
-        if (($this->option('output')=='all') || ($this->option('output')=='warn')) {
-            foreach ($output['warn'] as $key => $output_text) {
-                $this->warn($output_text);
-            }
-        }
-        if (($this->option('output')=='all') || ($this->option('output')=='error')) {
-            foreach ($output['error'] as $key => $output_text) {
-                $this->error($output_text);
-            }
-        }
-
-
-    }
-}
@@ -1,45 +0,0 @@
-<?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');
-
-    }
-}
@@ -1,135 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-
-class Version extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'version:update {--branch=master} {--type=patch}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Command description';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-
-        $use_branch = $this->option('branch');
-        $use_type = $this->option('type');
-        $git_branch = trim(shell_exec('git rev-parse --abbrev-ref HEAD'));
-        $build_version = trim(shell_exec('git rev-list --count '.$use_branch));
-        $versionFile = 'config/version.php';
-        $full_hash_version = str_replace("\n", '', shell_exec('git describe master --tags'));
-
-        $version = explode('-', $full_hash_version);
-        $app_version = $current_app_version = $version[0];
-        $hash_version = (array_key_exists('2', $version)) ? $version[2] : '';
-        $prerelease_version = '';
-
-        $this->line('Branch is: '.$use_branch);
-        $this->line('Type is: '.$use_type);
-        $this->line('Current version is: '.$full_hash_version);
-
-        if (count($version)==3) {
-            $this->line('This does not look like an alpha/beta release.');
-        } else {
-            if (array_key_exists('3',$version)) {
-                $this->line('The current version looks like a beta release.');
-                $prerelease_version = $version[1];
-                $hash_version = $version[3];
-            }
-        }
-
-
-        $app_version_raw = explode('.', $app_version);
-
-        $maj = str_replace('v', '', $app_version_raw[0]);
-        $min = $app_version_raw[1];
-        $patch = '';
-
-
-
-        // This is a major release that might not have a third .0
-        if (array_key_exists(2, $app_version_raw)) {
-            $patch = $app_version_raw[2];
-        }
-
-        if ($use_type=='major') {
-            $app_version = "v".($maj + 1).".$min.$patch";
-        } elseif ($use_type=='minor') {
-            $app_version = "v"."$maj.".($min + 1).".$patch";
-        } elseif ($use_type=='pre') {
-            $pre_raw = str_replace('beta','', $prerelease_version);
-            $pre_raw = str_replace('alpha','', $pre_raw);
-            $pre_raw = str_ireplace('rc','', $pre_raw);
-            $pre_raw = $pre_raw++;
-            $this->line('Setting the pre-release to '. $prerelease_version.'-'.$pre_raw);
-            $app_version = "v"."$maj.".($min + 1).".$patch";
-        } elseif ($use_type=='patch') {
-            $app_version = "v" . "$maj.$min." . ($patch + 1);
-        // If nothing is passed, leave the version as it is, just increment the build
-        } else {
-            $app_version = "v" . "$maj.$min." . $patch;
-        }
-
-        // Determine if this tag already exists, or if this prior to a release
-        $this->line('Running: git rev-parse master '.$current_app_version);
-        // $pre_release = trim(shell_exec('git rev-parse '.$use_branch.' '.$current_app_version.' 2>&1 1> /dev/null'));
-
-        if ($use_branch=='develop') {
-            $app_version = $app_version.'-pre';
-        }
-
-        $full_app_version = $app_version.' - build '.$build_version.'-'.$hash_version;
-
-
-        $array = var_export(
-            array(
-                'app_version' => $app_version,
-                'full_app_version' => $full_app_version,
-                'build_version' => $build_version,
-                'prerelease_version' => $prerelease_version,
-                'hash_version' => $hash_version,
-                'full_hash' => $full_hash_version,
-                'branch' => $git_branch),
-            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->info('Setting NEW version: '. $full_app_version.' ('.$git_branch.')');
-    }
-
-}
@@ -1,55 +0,0 @@
-<?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\Version::class,
-        Commands\SystemBackup::class,
-        Commands\DisableLDAP::class,
-        Commands\Purge::class,
-        Commands\LdapSync::class,
-        Commands\FixDoubleEscape::class,
-        Commands\RecryptFromMcrypt::class,
-        Commands\ResetDemoSettings::class,
-        Commands\SyncAssetLocations::class,
-        Commands\RegenerateAssetTags::class,
-        Commands\SyncAssetCounters::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-checkin')->daily();
-        $schedule->command('snipeit:backup')->weekly();
-        $schedule->command('backup:clean')->daily();
-    }
-
-    protected function commands()
-    {
-        require base_path('routes/console.php');
-    }
-}
@@ -1,8 +0,0 @@
-<?php
-
-namespace App\Events;
-
-abstract class Event
-{
-    //
-}
@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-use Exception;
-class CheckoutNotAllowed extends Exception
-{
-    public function __toString()
-    {
-       return "A checkout is not allowed under these circumstances";
-    }
-}
@@ -1,120 +0,0 @@
-<?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;
-use Log;
-
-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)
-    {
-        if ($this->shouldReport($exception)) {
-            Log::error($exception);
-            return 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', null, $e->response['messages'], 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');
-    }
-}
@@ -1,861 +0,0 @@
-<?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
-        // If no currency symbol is set, default to $ because Murica
-        $currencySymbol = $LocaleInfo['currency_symbol'];
-        if (empty($currencySymbol)) {
-            $currencySymbol = '$';
-        }
-
-        $floatString = str_replace($currencySymbol, '', $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('default_label', 'desc')->orderBy('name','asc')->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',
-            'license' => 'License'
-        );
-        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::withCount('consumableAssignments')->whereNotNull('min_amt')->get();
-        $accessories = Accessory::withCount('users')->whereNotNull('min_amt')->get();
-        $components = Component::withCount('assets')->whereNotNull('min_amt')->get();
-
-        $avail_consumables = 0;
-        $items_array = array();
-        $all_count = 0;
-
-        foreach ($consumables as $consumable) {
-            $avail = $consumable->qty - $consumable->consumable_assignment_count;  //$consumable->numRemaining();
-            if ($avail < ($consumable->min_amt) + \App\Models\Setting::getSettings()->alert_threshold) {
-                if ($consumable->qty > 0) {
-                    $percent = number_format((($avail / $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'] = $avail;
-                $items_array[$all_count]['min_amt']=$consumable->min_amt;
-                $all_count++;
-            }
-
-
-        }
-
-        foreach ($accessories as $accessory) {
-            $avail = $accessory->qty - $accessory->users_count;
-            if ($avail < ($accessory->min_amt) + \App\Models\Setting::getSettings()->alert_threshold) {
-
-                if ($accessory->qty > 0) {
-                    $percent = number_format((($avail / $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'] = $avail;
-                $items_array[$all_count]['min_amt']=$accessory->min_amt;
-                $all_count++;
-            }
-
-        }
-
-        foreach ($components as $component) {
-            $avail = $component->qty - $component->assets_count;
-            if ($avail < ($component->min_amt) + \App\Models\Setting::getSettings()->alert_threshold) {
-                if ($component->qty > 0) {
-                    $percent = number_format((($avail / $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'] = $avail;
-                $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) &&  (is_array($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'];
-
-    }
-
-
-    // Nicked from Drupal :)
-    // Returns a file size limit in bytes based on the PHP upload_max_filesize
-    // and post_max_size
-    public static function file_upload_max_size() {
-        static $max_size = -1;
-
-        if ($max_size < 0) {
-
-            // Start with post_max_size.
-            $post_max_size = Helper::parse_size(ini_get('post_max_size'));
-            if ($post_max_size > 0) {
-                $max_size = $post_max_size;
-            }
-
-            // If upload_max_size is less, then reduce. Except if upload_max_size is
-            // zero, which indicates no limit.
-            $upload_max = Helper::parse_size(ini_get('upload_max_filesize'));
-            if ($upload_max > 0 && $upload_max < $max_size) {
-                $max_size = $upload_max;
-            }
-        }
-
-        return $max_size;
-    }
-
-    public static function file_upload_max_size_readable() {
-        static $max_size = -1;
-
-        if ($max_size < 0) {
-            // Start with post_max_size.
-            $post_max_size = Helper::parse_size(ini_get('post_max_size'));
-            if ($post_max_size > 0) {
-                $max_size = ini_get('post_max_size');
-            }
-
-            // If upload_max_size is less, then reduce. Except if upload_max_size is
-            // zero, which indicates no limit.
-            $upload_max = Helper::parse_size(ini_get('upload_max_filesize'));
-            if ($upload_max > 0 && $upload_max < $max_size) {
-                $max_size = ini_get('upload_max_filesize');
-            }
-        }
-        return $max_size;
-    }
-
-    public static function parse_size($size) {
-        $unit = preg_replace('/[^bkmgtpezy]/i', '', $size); // Remove the non-unit characters from the size.
-        $size = preg_replace('/[^0-9\.]/', '', $size); // Remove the non-numeric characters from the size.
-        if ($unit) {
-            // Find the position of the unit in the ordered string which is the power of magnitude to multiply a kilobyte by.
-            return round($size * pow(1024, stripos('bkmgtpezy', $unit[0])));
-        }
-        else {
-            return round($size);
-        }
-    }
-
-
-    public static function filetype_icon($filename) {
-
-        $extension = substr(strrchr($filename,'.'),1);
-
-        if ($extension) {
-            switch ($extension) {
-                case 'jpg':
-                case 'jpeg':
-                case 'gif':
-                case 'png':
-                    return "fa fa-file-image-o";
-                    break;
-                case 'doc':
-                case 'docx':
-                    return "fa fa-file-word-o";
-                    break;
-                case 'xls':
-                case 'xlsx':
-                    return "fa fa-file-excel-o";
-                    break;
-                case 'zip':
-                case 'rar':
-                    return "fa fa-file-archive-o";
-                    break;
-                case 'pdf':
-                    return "fa fa-file-pdf-o";
-                    break;
-                case 'txt':
-                    return "fa fa-file-text-o";
-                    break;
-                case 'lic':
-                    return "fa fa-floppy-o";
-                    break;
-                default:
-                    return "fa fa-file-o";
-            }
-        }
-        return "fa fa-file-o";
-    }
-
-    public static function show_file_inline($filename) {
-
-        $extension = substr(strrchr($filename,'.'),1);
-
-        if ($extension) {
-            switch ($extension) {
-                case 'jpg':
-                case 'jpeg':
-                case 'gif':
-                case 'png':
-                    return true;
-                    break;
-                default:
-                    return false;
-            }
-        }
-        return false;
-    }
-
-
-
-
-}
@@ -1,402 +0,0 @@
-<?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 Redirect;
-use Illuminate\Http\Request;
-use Slack;
-use Str;
-use View;
-use Image;
-use App\Http\Requests\ImageUploadRequest;
-
-/** This controller handles all actions related to Accessories for
- * the Snipe-IT Asset Management application.
- *
- * @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);
-        $category_type = 'accessory';
-        return view('accessories/edit')->with('category_type', $category_type)
-          ->with('item', new Accessory);
-    }
-
-
-  /**
-   * Validate and save new Accessory from form post
-   *
-   * @author [A. Gianotto] [<snipe@snipe.net>]
-   * @return Redirect
-   */
-    public function store(ImageUploadRequest $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;
-        $accessory->supplier_id             = request('supplier_id');
-
-        if ($request->hasFile('image')) {
-
-            if (!config('app.lock_passwords')) {
-                $image = $request->file('image');
-                $ext = $image->getClientOriginalExtension();
-                $file_name = "accessory-".str_random(18).'.'.$ext;
-                $path = public_path('/uploads/accessories');
-                if ($image->getClientOriginalExtension()!='svg') {
-                    Image::make($image->getRealPath())->resize(null, 250, function ($constraint) {
-                        $constraint->aspectRatio();
-                        $constraint->upsize();
-                    })->save($path.'/'.$file_name);
-                } else {
-                    $image->move($path, $file_name);
-                }
-                $accessory->image = $file_name;
-            }
-        }
-
-
-
-        // Was the accessory created?
-        if ($accessory->save()) {
-            // 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)
-    {
-
-        if ($item = Accessory::find($accessoryId)) {
-            $this->authorize($item);
-            $category_type = 'accessory';
-            return view('accessories/edit', compact('item'))->with('category_type', $category_type);
-        }
-
-        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
-
-    }
-
-
-  /**
-   * Save edited Accessory from form post
-   *
-   * @author [A. Gianotto] [<snipe@snipe.net>]
-   * @param  int  $accessoryId
-   * @return Redirect
-   */
-    public function update(ImageUploadRequest $request, $accessoryId = null)
-    {
-        if (is_null($accessory = Accessory::find($accessoryId))) {
-            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
-        }
-
-        $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');
-        $accessory->supplier_id             = request('supplier_id');
-
-        if ($request->hasFile('image')) {
-            
-            if (!config('app.lock_passwords')) {
-                
-                
-                $image = $request->file('image');
-                $ext = $image->getClientOriginalExtension();
-                $file_name = "accessory-".str_random(18).'.'.$ext;
-                $path = public_path('/uploads/accessories');
-                if ($image->getClientOriginalExtension()!='svg') {
-                    Image::make($image->getRealPath())->resize(null, 250, function ($constraint) {
-                        $constraint->aspectRatio();
-                        $constraint->upsize();
-                    })->save($path.'/'.$file_name);
-                } else {
-                    $image->move($path, $file_name);
-                }
-                if (($accessory->image) && (file_exists($path.'/'.$accessory->image))) {
-                    unlink($path.'/'.$accessory->image);
-                }
-
-                $accessory->image = $file_name;
-            }
-        }
-
-
-        // Was the accessory updated?
-        if ($accessory->save()) {
-            return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.update.success'));
-        }
-        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'));
-        }
-        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist', compact('id')));
-    }
-
-  /**
-   * 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'));
-        }
-
-        if ($accessory->category) {
-
-            $this->authorize('checkout', $accessory);
-
-            // Get the dropdown of users and then pass it to the checkout view
-            return view('accessories/checkout', compact('accessory'));
-        }
-
-        return redirect()->back()->with('error', 'The category type for this accessory is not valid. Edit the accessory and select a valid accessory category.');
-
-
-
-    }
-
-  /**
-   * 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('checkout/accessory', $accessory->id)->with('error', trans('admin/accessories/message.checkout.user_does_not_exist'));
-        }
-
-      // 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();
-
-      // 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.does_not_exist'));
-        }
-
-        $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['last_name'] = e($user->last_name);
-            $data['item_name'] = e($accessory->name);
-            $data['checkin_date'] = e($logaction->created_at);
-            $data['item_tag'] = '';
-            $data['note'] = e($logaction->note);
-
-            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'));
-    }
-
-
-}
@@ -1,18 +0,0 @@
-<?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);
-    }
-}
@@ -1,194 +0,0 @@
-<?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;
-use App\Models\Company;
-
-
-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('category_id')) {
-            $accessories->where('category_id','=',$request->input('category_id'));
-        }
-
-        if ($request->has('manufacturer_id')) {
-            $accessories->where('manufacturer_id','=',$request->input('manufacturer_id'));
-        }
-
-        if ($request->has('supplier_id')) {
-            $accessories->where('supplier_id','=',$request->input('supplier_id'));
-        }
-
-        $offset = $request->input('offset', 0);
-        $limit = $request->input('limit', 50);
-        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        $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);
-        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);
-        if (!Company::isCurrentUserHasAccess($accessory)) {
-            return ['total' => 0, 'rows' => []];
-        }
-        $accessory_users = $accessory->users;
-        $total = $accessory_users->count();
-
-        return (new AccessoriesTransformer)->transformCheckedoutAccessory($accessory_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')));
-
-    }
-}
@@ -1,247 +0,0 @@
-<?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')));
-        }
-
-        if ($request->has('asset_id')) {
-            $maintenances->where('asset_id', '=', $request->input('asset_id'));
-        }
-
-        $offset = request('offset', 0);
-        $limit = request('limit', 50);
-
-        $allowed_columns = [
-                                'id',
-                                'title',
-                                'asset_maintenance_time',
-                                'asset_maintenance_type',
-                                'cost',
-                                'start_date',
-                                'completion_date',
-                                'notes',
-                                'asset_tag',
-                                'asset_name',
-                                '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;
-            case 'asset_tag':
-                $maintenances = $maintenances->OrderByTag($order);
-                break;
-            case 'asset_name':
-                $maintenances = $maintenances->OrderByAssetName($order);
-                break;
-            default:
-                $maintenances = $maintenances->orderBy($sort, $order);
-                break;
-        }
-
-        $total = $maintenances->count();
-        $maintenances = $maintenances->skip($offset)->take($limit)->get();
-        return (new AssetMaintenancesTransformer())->transformAssetMaintenances($maintenances, $total);
-
-
-    }
-
-
-    /**
-     *  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);
-
-    }
-}
@@ -1,243 +0,0 @@
-<?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;
-use App\Http\Transformers\SelectlistTransformer;
-
-
-/**
- * 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','assets_count'];
-
-        $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',
-            'models.deleted_at',
-            'models.updated_at',
-         ])
-            ->with('category','depreciation', 'manufacturer','fieldset')
-            ->withCount('assets');
-
-
-
-        if ($request->has('status')) {
-            $assetmodels->onlyTrashed();
-        }
-
-        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/models/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')));
-        }
-
-        if ($assetmodel->image) {
-            try  {
-                unlink(public_path().'/uploads/models/'.$assetmodel->image);
-            } catch (\Exception $e) {
-                \Log::error($e);
-            }
-        }
-
-        $assetmodel->delete();
-        return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/models/message.delete.success')));
-
-    }
-
-    /**
-     * Gets a paginated collection for the select2 menus
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v4.0.16]
-     * @see \App\Http\Transformers\SelectlistTransformer
-     *
-     */
-    public function selectlist(Request $request)
-    {
-
-        $assetmodels = AssetModel::select([
-            'models.id',
-            'models.name',
-            'models.image',
-            'models.model_number',
-            'models.manufacturer_id',
-            'models.category_id',
-        ])->with('manufacturer','category');
-
-        $settings = \App\Models\Setting::getSettings();
-
-        if ($request->has('search')) {
-            $assetmodels = $assetmodels->SearchByManufacturerOrCat($request->input('search'));
-        }
-
-        $assetmodels = $assetmodels->OrderCategory('ASC')->OrderManufacturer('ASC')->orderby('models.name', 'asc')->orderby('models.model_number', 'asc')->paginate(50);
-
-        foreach ($assetmodels as $assetmodel) {
-
-            $assetmodel->use_text = '';
-
-            if ($settings->modellistCheckedValue('category')) {
-                $assetmodel->use_text .= (($assetmodel->category) ? e($assetmodel->category->name).' - ' : '');
-            }
-
-            if ($settings->modellistCheckedValue('manufacturer')) {
-                $assetmodel->use_text .= (($assetmodel->manufacturer) ? e($assetmodel->manufacturer->name).' ' : '');
-            }
-
-            $assetmodel->use_text .=  e($assetmodel->name);
-
-            if (($settings->modellistCheckedValue('model_number')) && ($assetmodel->model_number!='')) {
-                $assetmodel->use_text .=  ' (#'.e($assetmodel->model_number).')';
-            }
-
-            $assetmodel->use_image = ($settings->modellistCheckedValue('image') && ($assetmodel->image)) ? url('/').'/uploads/models/'.$assetmodel->image : null;
-        }
-
-        return (new SelectlistTransformer)->transformSelectlist($assetmodels);
-    }
-
-}
@@ -1,791 +0,0 @@
-<?php
-namespace App\Http\Controllers\Api;
-
-use App\Helpers\Helper;
-use App\Http\Controllers\Controller;
-use App\Http\Requests\AssetRequest;
-use App\Http\Requests\AssetCheckoutRequest;
-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;
-use App\Http\Transformers\SelectlistTransformer;
-
-
-/**
- * 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);
-        $settings = Setting::getSettings();
-
-        $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',
-            'last_audit_date',
-            'next_audit_date',
-            'warranty_months',
-            'checkout_counter',
-            'checkin_counter',
-            'requests_counter',
-        ];
-
-        $filter = array();
-
-        if ($request->has('filter')) {
-            $filter = json_decode($request->input('filter'), true);
-        }
-
-        $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.*'),"company_id","assets")
-            ->with('location', 'assetstatus', 'assetlog', 'company', 'defaultLoc','assignedTo',
-            'model.category', 'model.manufacturer', 'model.fieldset','supplier');
-
-
-        // These are used by the API to query against specific ID numbers.
-        // They are also used by the individual searches on detail pages like
-        // locations, etc.
-        if ($request->has('status_id')) {
-            $assets->where('assets.status_id', '=', $request->input('status_id'));
-        }
-
-        if ($request->input('requestable')=='true') {
-            $assets->where('assets.requestable', '=', '1');
-        }
-
-        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->where('assets.location_id', '=', $request->input('location_id'));
-        }
-
-        if ($request->has('supplier_id')) {
-            $assets->where('assets.supplier_id', '=', $request->input('supplier_id'));
-        }
-
-        if (($request->has('assigned_to')) && ($request->has('assigned_type'))) {
-            $assets->where('assets.assigned_to', '=', $request->input('assigned_to'))
-                    ->where('assets.assigned_type', '=', $request->input('assigned_type'));
-        }
-
-        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'));
-        }
-
-        if ($request->has('depreciation_id')) {
-            $assets->ByDepreciationId($request->input('depreciation_id'));
-        }
-
-        $request->has('order_number') ? $assets = $assets->where('assets.order_number', '=', e($request->get('order_number'))) : '';
-
-        $offset = request('offset', 0);
-        $limit = $request->input('limit', 50);
-        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-
-        // This is used by the sidenav, mostly
-
-        // We switched from using query scopes here because of a Laravel bug
-        // related to fulltext searches on complex queries.
-        // I am sad. :(
-        switch ($request->input('status')) {
-            case 'Deleted':
-                $assets->withTrashed()->Deleted();
-                break;
-            case 'Pending':
-                $assets->join('status_labels AS status_alias',function ($join) {
-                    $join->on('status_alias.id', "=", "assets.status_id")
-                        ->where('status_alias.deployable','=',0)
-                        ->where('status_alias.pending','=',1)
-                        ->where('status_alias.archived', '=', 0);
-                });
-                break;
-            case 'RTD':
-                $assets->whereNull('assets.assigned_to')
-                ->join('status_labels AS status_alias',function ($join) {
-                    $join->on('status_alias.id', "=", "assets.status_id")
-                        ->where('status_alias.deployable','=',1)
-                        ->where('status_alias.pending','=',0)
-                        ->where('status_alias.archived', '=', 0);
-                });
-                break;
-            case 'Undeployable':
-                $assets->Undeployable();
-                break;
-            case 'Archived':
-                $assets->join('status_labels AS status_alias',function ($join) {
-                    $join->on('status_alias.id', "=", "assets.status_id")
-                        ->where('status_alias.deployable','=',0)
-                        ->where('status_alias.pending','=',0)
-                        ->where('status_alias.archived', '=', 1);
-                });
-                break;
-            case 'Requestable':
-                $assets->where('assets.requestable', '=', 1)
-                    ->join('status_labels AS status_alias',function ($join) {
-                    $join->on('status_alias.id', "=", "assets.status_id")
-                        ->where('status_alias.deployable','=',1)
-                        ->where('status_alias.pending','=',0)
-                        ->where('status_alias.archived', '=', 0);
-                });
-
-                break;
-            case 'Deployed':
-                // more sad, horrible workarounds for laravel bugs when doing full text searches
-                $assets->where('assets.assigned_to', '>', '0');
-                break;
-            default:
-
-                if ((!$request->has('status_id')) && ($settings->show_archived_in_list!='1')) {
-                    // terrible workaround for complex-query Laravel bug in fulltext
-                    $assets->join('status_labels AS status_alias',function ($join) {
-                        $join->on('status_alias.id', "=", "assets.status_id")
-                            ->where('status_alias.archived', '=', 0);
-                    });
-                    
-                // If there is a status ID, don't take show_archived_in_list into consideration
-                } else {
-                    $assets->join('status_labels AS status_alias',function ($join) {
-                        $join->on('status_alias.id', "=", "assets.status_id");
-                    });
-                }
-
-        }
-
-
-        if ((!is_null($filter)) && (count($filter)) > 0) {
-            $assets->ByFilter($filter);
-        } elseif ($request->has('search')) {
-            $assets->TextSearch($request->input('search'));
-        }
-
-
-        // This is kinda gross, but we need to do this because the Bootstrap Tables
-        // API passes custom field ordering as custom_fields.fieldname, and we have to strip
-        // that out to let the default sorter below order them correctly on the assets table.
-        $sort_override = str_replace('custom_fields.','', $request->input('sort')) ;
-
-        // This handles all of the pivot sorting (versus the assets.* fields
-        // in the allowed_columns array)
-        $column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'assets.created_at';
-        
-        
-        switch ($sort_override) {
-            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);
-            case 'rtd_location':
-                $assets->OrderRtdLocation($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 (by tag) for detail view.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param string $tag
-     * @since [v4.2.1]
-     * @return JsonResponse
-     */
-    public function showByTag($tag)
-    {
-        if ($asset = Asset::with('assetstatus')->with('assignedTo')->withTrashed()->where('asset_tag',$tag)->first()) {
-            $this->authorize('view', $asset);
-            return (new AssetsTransformer)->transformAsset($asset);
-        }
-        return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 404);
-
-    }
-
-    /**
-     * Returns JSON with information about an asset (by serial) for detail view.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param string $serial
-     * @since [v4.2.1]
-     * @return JsonResponse
-     */
-    public function showBySerial($serial)
-    {
-        if ($assets = Asset::with('assetstatus')->with('assignedTo')
-            ->withTrashed()->where('serial',$serial)->get()) {
-                $this->authorize('view', $assets);
-                return (new AssetsTransformer)->transformAssets($assets, $assets->count());
-        }
-        return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 404);
-
-    }
-
-
-     /**
-     * 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::with('assetstatus')->with('assignedTo')->withTrashed()->withCount('checkins', 'checkouts', 'userRequests')->findOrFail($id)) {
-            $this->authorize('view', $asset);
-            return (new AssetsTransformer)->transformAsset($asset);
-        }
-
-
-    }
-
-
-    /**
-     * Gets a paginated collection for the select2 menus
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v4.0.16]
-     * @see \App\Http\Transformers\SelectlistTransformer
-     *
-     */
-    public function selectlist(Request $request)
-    {
-
-        $assets = Company::scopeCompanyables(Asset::select([
-            'assets.id',
-            'assets.name',
-            'assets.asset_tag',
-            'assets.model_id',
-            'assets.assigned_to',
-            'assets.assigned_type',
-            'assets.status_id'
-            ])->with('model', 'assetstatus', 'assignedTo')->NotArchived());
-
-        if ($request->has('assetStatusType') && $request->input('assetStatusType') === 'RTD') {
-            $assets = $assets->RTD();
-        }
-
-        if ($request->has('search')) {
-            $assets = $assets->AssignedSearch($request->input('search'));
-        }
-
-
-        $assets = $assets->paginate(50);
-
-        // Loop through and set some custom properties for the transformer to use.
-        // This lets us have more flexibility in special cases like assets, where
-        // they may not have a ->name value but we want to display something anyway
-        foreach ($assets as $asset) {
-
-
-            $asset->use_text = $asset->present()->fullName;
-
-            if (($asset->checkedOutToUser()) && ($asset->assigned)) {
-                $asset->use_text .= ' → '.$asset->assigned->getFullNameAttribute();
-            }
-
-            
-            if ($asset->assetstatus->getStatuslabelType()=='pending') {
-                $asset->use_text .=  '('.$asset->assetstatus->getStatuslabelType().')';
-            }
-
-            $asset->use_image = ($asset->getImageUrl()) ? $asset->getImageUrl() : null;
-        }
-
-        return (new SelectlistTransformer)->transformSelectlist($assets);
-
-    }
-
-
-    /**
-     * 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::autoincrement_asset());
-        $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(), null));
-            }
-        }
-
-        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 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('edit', 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('rtd_location_id')) ?
-                $asset->location_id = $request->get('rtd_location_id') : '';
-            ($request->has('company_id')) ?
-                $asset->company_id = Company::getIdForCurrentUser($request->get('company_id')) : '';
-
-
-            // Update custom fields
-            if (($model = AssetModel::find($asset->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->has('assigned_user')) && ($target = User::find($request->get('assigned_user')))) {
-                        $location = $target->location_id;
-                } elseif (($request->has('assigned_asset')) && ($target = Asset::find($request->get('assigned_asset')))) {
-                            $location = $target->location_id;
-                } elseif (($request->has('assigned_location')) && ($target = Location::find($request->get('assigned_location')))) {
-                    $location = $target->id;
-                }
-
-                if (isset($target)) {
-                    $asset->checkOut($target, Auth::user(), date('Y-m-d H:i:s'), '', 'Checked out on asset update', e($request->get('name')), $location);
-                }
-
-                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(AssetCheckoutRequest $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);
-
-        $error_payload = [];
-        $error_payload['asset'] = [
-            'id' => $asset->id,
-            'asset_tag' => $asset->asset_tag,
-        ];
-
-
-        // This item is checked out to a location
-        if (request('checkout_to_type')=='location') {
-            $target = Location::find(request('assigned_location'));
-            $asset->location_id = ($target) ? $target->id : '';
-            $error_payload['target_id'] = $request->input('assigned_location');
-            $error_payload['target_type'] = 'location';
-
-        } elseif (request('checkout_to_type')=='asset') {
-            $target = Asset::where('id','!=',$asset_id)->find(request('assigned_asset'));
-            $asset->location_id = $target->rtd_location_id;
-            // Override with the asset's location_id if it has one
-            if ($target->location_id!='') {
-                $asset->location_id = ($target) ? $target->location_id : '';
-            }
-            $error_payload['target_id'] = $request->input('assigned_asset');
-            $error_payload['target_type'] = 'asset';
-
-        } elseif (request('checkout_to_type')=='user') {
-            // Fetch the target and set the asset's new location_id
-            $target = User::find(request('assigned_user'));
-            $asset->location_id = ($target) ? $target->location_id : '';
-            $error_payload['target_id'] = $request->input('assigned_user');
-            $error_payload['target_type'] = 'user';
-        }
-
-
-
-        if (!isset($target)) {
-            return response()->json(Helper::formatStandardApiResponse('error', $error_payload, 'Checkout target for asset '.e($asset->asset_tag).' is invalid - '.$error_payload['target_type'].' does not exist.'));
-        }
-
-
-
-        $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);
-        
-        // Set the location ID to the RTD location id if there is one
-        if ($asset->rtd_location_id!='') {
-            $asset->location_id = $target->rtd_location_id;
-        }
-
-
-
-        
-
-        if ($asset->checkOut($target, Auth::user(), $checkout_at, $expected_checkin, $note, $asset_name, $asset->location_id)) {
-            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(Request $request, $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 = Input::get('name');
-        $asset->location_id =  $asset->rtd_location_id;
-
-        if ($request->has('location_id')) {
-            $asset->location_id =  $request->input('location_id');
-        }
-
-        if (Input::has('status_id')) {
-            $asset->status_id =  Input::get('status_id');
-        }
-
-        if ($asset->save()) {
-            $asset->logCheckin($target, e(request('note')));
-            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) {
-            // We don't want to log this as a normal update, so let's bypass that
-            $asset->unsetEventDispatcher();
-            $asset->next_audit_date = $request->input('next_audit_date');
-            $asset->last_audit_date = date('Y-m-d h:i:s');
-
-            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'));
-
-
-
-
-
-    }
-
-
-
-    /**
-     * Returns JSON listing of all requestable assets
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v4.0]
-     * @return JsonResponse
-     */
-    public function requestable(Request $request)
-    {
-        
-        $assets = Company::scopeCompanyables(Asset::select('assets.*'),"company_id","assets")
-            ->with('location', 'assetstatus', 'assetlog', 'company', 'defaultLoc','assignedTo',
-                'model.category', 'model.manufacturer', 'model.fieldset','supplier')->where('assets.requestable', '=', '1');
-
-        $offset = request('offset', 0);
-        $limit = $request->input('limit', 50);
-        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        $assets->TextSearch($request->input('search'));
-
-        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;
-            default:
-                $assets->orderBy('assets.created_at', $order);
-                break;
-        }
-
-
-        $total = $assets->count();
-        $assets = $assets->skip($offset)->take($limit)->get();
-        return (new AssetsTransformer)->transformRequestedAssets($assets, $total);
-    }
-}
@@ -1,168 +0,0 @@
-<?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;
-use App\Http\Transformers\SelectlistTransformer;
-
-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', 'category_type','use_default_eula','eula_text', 'require_acceptance','checkin_email', 'assets_count', 'accessories_count', 'consumables_count', 'components_count','licenses_count', 'image'];
-
-        $categories = Category::select(['id', 'created_at', 'updated_at', 'name','category_type','use_default_eula','eula_text', 'require_acceptance','checkin_email','image'])
-            ->withCount('assets', 'accessories', 'consumables', 'components','licenses');
-
-        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') : 'assets_count';
-        $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')));
-
-    }
-
-
-    /**
-     * Gets a paginated collection for the select2 menus
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v4.0.16]
-     * @see \App\Http\Transformers\SelectlistTransformer
-     *
-     */
-    public function selectlist(Request $request, $category_type = 'asset')
-    {
-
-        $categories = Category::select([
-            'id',
-            'name',
-            'image',
-        ]);
-
-        if ($request->has('search')) {
-            $categories = $categories->where('name', 'LIKE', '%'.$request->get('search').'%');
-        }
-
-        $categories = $categories->where('category_type', $category_type)->orderBy('name', 'ASC')->paginate(50);
-
-        // Loop through and set some custom properties for the transformer to use.
-        // This lets us have more flexibility in special cases like assets, where
-        // they may not have a ->name value but we want to display something anyway
-        foreach ($categories as $category) {
-            $category->use_image = ($category->image) ? url('/').'/uploads/categories/'.$category->image : null;
-        }
-
-        return (new SelectlistTransformer)->transformSelectlist($categories);
-
-    }
-
-}
@@ -1,186 +0,0 @@
-<?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;
-use App\Http\Transformers\SelectlistTransformer;
-
-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',
-            'created_at',
-            'updated_at',
-            'users_count',
-            'assets_count',
-            'licenses_count',
-            'accessories_count',
-            'consumables_count',
-            'components_count',
-        ];
-
-        $companies = Company::withCount('assets','licenses','accessories','consumables','components','users');
-
-        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;
-            }
-        }
-
-    }
-
-    /**
-     * Gets a paginated collection for the select2 menus
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v4.0.16]
-     * @see \App\Http\Transformers\SelectlistTransformer
-     *
-     */
-    public function selectlist(Request $request)
-    {
-
-        $companies = Company::select([
-            'companies.id',
-            'companies.name',
-            'companies.image',
-        ]);
-
-        if ($request->has('search')) {
-            $companies = $companies->where('companies.name', 'LIKE', '%'.$request->get('search').'%');
-        }
-
-        $companies = $companies->orderBy('name', 'ASC')->paginate(50);
-
-        // Loop through and set some custom properties for the transformer to use.
-        // This lets us have more flexibility in special cases like assets, where
-        // they may not have a ->name value but we want to display something anyway
-        foreach ($companies as $company) {
-            $company->use_image = ($company->image) ? url('/').'/uploads/companies/'.$company->image : null;
-        }
-
-        return (new SelectlistTransformer)->transformSelectlist($companies);
-    }
-}
@@ -1,169 +0,0 @@
-<?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'));
-        }
-
-        if ($request->has('company_id')) {
-            $components->where('company_id','=',$request->input('company_id'));
-        }
-
-        if ($request->has('category_id')) {
-            $components->where('category_id','=',$request->input('category_id'));
-        }
-
-        $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','image'];
-        $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::findOrFail($id);
-
-        if ($component) {
-            return (new ComponentsTransformer)->transformComponent($component);
-        }
-    }
-
-
-    /**
-     * 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('view', \App\Models\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 ComponentsTransformer)->transformCheckedoutComponents($assets, $total);
-    }
-}
@@ -1,191 +0,0 @@
-<?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','image'];
-        $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::with(array('consumableAssignments'=>
-        function ($query) {
-            $query->orderBy('created_at', 'DESC');
-        },
-        'consumableAssignments.admin'=> function ($query) {
-        },
-        'consumableAssignments.user'=> function ($query) {
-        },
-        ))->find($consumableId);
-
-        if (!Company::isCurrentUserHasAccess($consumable)) {
-            return ['total' => 0, 'rows' => []];
-        }
-        $this->authorize('view', Consumable::class);
-        $rows = array();
-
-        foreach ($consumable->consumableAssignments as $consumable_assignment) {
-            $rows[] = [
-                'name' => ($consumable_assignment->user) ? $consumable_assignment->user->present()->nameUrl() : 'Deleted User',
-                'created_at' => Helper::getFormattedDateObject($consumable_assignment->created_at, 'datetime'),
-                'admin' => ($consumable_assignment->admin) ? $consumable_assignment->admin->present()->nameUrl() : '',
-            ];
-        }
-
-        $consumableCount = $consumable->users->count();
-        $data = array('total' => $consumableCount, 'rows' => $rows);
-        return $data;
-    }
-}
@@ -1,179 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use App\Helpers\Helper;
-use App\Http\Controllers\Controller;
-use App\Http\Transformers\CustomFieldsTransformer;
-use App\Models\CustomField;
-use App\Models\CustomFieldset;
-use Illuminate\Http\Request;
-use Validator;
-use Illuminate\Validation\Rule;
-
-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();
-        return (new CustomFieldsTransformer)->transformCustomFields($fields, $fields->count());
-    }
-
-    /**
-    * Shows the given field
-    * @author [V. Cordes] [<volker@fdatek.de>]
-    * @param int $id
-    * @since [v4.1.10]
-    * @return View
-    */
-    public function show($id)
-    {
-      $this->authorize('show', CustomField::class);
-        if ($field = CustomField::find($id)) {
-            return (new CustomFieldsTransformer)->transformCustomField($field);
-        }
-
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/custom_fields/message.field.invalid')), 200);
-    }
-
-     /**
-     * Update the specified field
-     *
-     * @author [V. Cordes] [<volker@fdatek.de>]
-     * @since [v4.1.10]
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function update(Request $request, $id)
-    {
-        $this->authorize('edit', CustomField::class);
-        $field = CustomField::findOrFail($id);
-        $data = $request->all();
-
-        $validator = Validator::make($data, $field->validationRules());
-        if ($validator->fails()) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, $validator->errors()));
-        }
-
-        $field->fill($data);
-
-        if ($field->save()) {
-            return response()->json(Helper::formatStandardApiResponse('success', $field, trans('admin/custom_fields/message.field.update.success')));
-        }
-
-        return response()->json(Helper::formatStandardApiResponse('error', null, $field->getErrors()));
-    }
-
-
-    /**
-     * Store a newly created field.
-     *
-     * @author [V. Cordes] [<volker@fdatek.de>]
-     * @since [v4.1.10]
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function store(Request $request)
-    {
-        $this->authorize('create', CustomField::class);
-        $field = new CustomField;
-
-        $data = $request->all();
-        $validator = Validator::make($data, $field->validationRules());
-        if ($validator->fails()) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, $validator->errors()));
-        }
-        $field->fill($data);
-
-        if ($field->save()) {
-            return response()->json(Helper::formatStandardApiResponse('success', $field, trans('admin/custom_fields/message.field.create.success')));
-        }
-        return response()->json(Helper::formatStandardApiResponse('error', null, $field->getErrors()));
-
-    }
-
-    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);
-
-    }
-
-    public function associate(Request $request, $field_id)
-    {
-        $this->authorize('edit', CustomFieldset::class);
-        $field = CustomField::findOrFail($field_id);
-
-        $fieldset_id = $request->input('fieldset_id');
-        foreach ($field->fieldset as $fieldset) {
-            if ($fieldset->id == $fieldset_id) {
-                return response()->json(Helper::formatStandardApiResponse('success', $fieldset, trans('admin/custom_fields/message.fieldset.update.success')));
-            }
-        }
-
-        $fieldset = CustomFieldset::findOrFail($fieldset_id);
-        $fieldset->fields()->attach($field->id, ["required" => ($request->input('required') == "on"), "order" => $request->input('order', $fieldset->fields->count())]);
-        return response()->json(Helper::formatStandardApiResponse('success', $fieldset, trans('admin/custom_fields/message.fieldset.update.success')));
-    }
-
-    public function disassociate(Request $request, $field_id)
-    {
-        $this->authorize('edit', CustomFieldset::class);
-        $field = CustomField::findOrFail($field_id);
-
-        $fieldset_id = $request->input('fieldset_id');
-        foreach ($field->fieldset as $fieldset) {
-            if ($fieldset->id == $fieldset_id) {
-                $fieldset->fields()->detach($field->id);
-                return response()->json(Helper::formatStandardApiResponse('success', $fieldset, trans('admin/custom_fields/message.fieldset.update.success')));
-            }
-        }
-        $fieldset = CustomFieldset::findOrFail($fieldset_id);
-        return response()->json(Helper::formatStandardApiResponse('success', $fieldset, trans('admin/custom_fields/message.fieldset.update.success')));
-    }
-
-    /**
-     * Delete a custom field.
-     *
-     * @author [Brady Wetherington] [<uberbrady@gmail.com>]
-     * @since [v1.8]
-     * @return Redirect
-     */
-    public function destroy($field_id)
-    {
-        $field = CustomField::findOrFail($field_id);
-
-        if ($field->fieldset->count() >0) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, 'Field is in use.'));
-        }
-
-        $field->delete();
-        return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/custom_fields/message.field.delete.success')));
-
-    }
-
-}
@@ -1,179 +0,0 @@
-<?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();
-        return (new CustomFieldsetsTransformer)->transformCustomFieldsets($fieldsets, $fieldsets->count());
-
-    }
-
-    /**
-    * 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'));
-
-
-
-    }
-
-    /**
-     * Return JSON containing a list of fields belonging to a fieldset.
-     *
-     * @author [V. Cordes] [<volker@fdatek.de>]
-     * @since [v4.1.10]
-     * @param $fieldsetId
-     * @return string JSON
-     */
-    public function fields($id)
-    {
-        $this->authorize('view', CustomFieldset::class);
-        $set = CustomFieldset::findOrFail($id);
-        $fields = $set->fields;
-        return (new CustomFieldsTransformer)->transformCustomFields($fields, $fields->count());
-    }
-
-    /**
-     * Return JSON containing a list of fields belonging to a fieldset with the
-     * default values for a given model
-     *
-     * @param $modelId
-     * @param $fieldsetId
-     * @return string JSON
-     */
-    public function fieldsWithDefaultValues($fieldsetId, $modelId)
-    {
-        $this->authorize('view', CustomFieldset::class);
-
-        $set = CustomFieldset::findOrFail($fieldsetId);
-
-        $fields = $set->fields;
-
-        return (new CustomFieldsTransformer)->transformCustomFieldsWithDefaultValues($fields, $modelId, $fields->count());
-    }
-}
@@ -1,160 +0,0 @@
-<?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;
-use App\Http\Transformers\SelectlistTransformer;
-
-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','image','users_count'];
-
-        $departments = Department::select([
-            'departments.id',
-            'departments.name',
-            'departments.location_id',
-            'departments.company_id',
-            'departments.manager_id',
-            'departments.created_at',
-            'departments.updated_at',
-            'departments.image'
-        ])->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';
-
-        switch ($request->input('sort')) {
-            case 'location':
-                $departments->OrderLocation($order);
-                break;
-            case 'manager':
-                $departments->OrderManager($order);
-                break;
-            default:
-                $departments->orderBy($sort, $order);
-                break;
-        }
-
-        $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')));
-
-    }
-
-    /**
-     * Gets a paginated collection for the select2 menus
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v4.0.16]
-     * @see \App\Http\Transformers\SelectlistTransformer
-     *
-     */
-    public function selectlist(Request $request)
-    {
-
-        $departments = Department::select([
-            'id',
-            'name',
-            'image',
-        ]);
-
-        if ($request->has('search')) {
-            $departments = $departments->where('name', 'LIKE', '%'.$request->get('search').'%');
-        }
-
-        $departments = $departments->orderBy('name', 'ASC')->paginate(50);
-
-        // Loop through and set some custom properties for the transformer to use.
-        // This lets us have more flexibility in special cases like assets, where
-        // they may not have a ->name value but we want to display something anyway
-        foreach ($departments as $department) {
-            $department->use_image = ($department->image) ? url('/').'/uploads/departments/'.$department->image : null;
-        }
-
-        return (new SelectlistTransformer)->transformSelectlist($departments);
-
-    }
-
-}
@@ -1,127 +0,0 @@
-<?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')));
-
-    }
-
-
-
-}
@@ -1,121 +0,0 @@
-<?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', 'users_count'];
-
-        $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 (new GroupsTransformer)->transformGroup($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')));
-
-    }
-
-
-}
@@ -1,175 +0,0 @@
-<?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;
-use App\Models\Asset;
-
-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);
-                }
-
-                //TODO: is there a lighter way to do this?
-                if (! ini_get("auto_detect_line_endings")) {
-                    ini_set("auto_detect_line_endings", '1');
-                }
-                $reader = Reader::createFromFileObject($file->openFile('r')); //file pointer leak?
-                $import->header_row = $reader->fetchOne(0);
-
-                //duplicate headers check
-                $duplicate_headers = [];
-
-                for($i = 0; $i<count($import->header_row); $i++) {
-                    $header = $import->header_row[$i];
-                    if(in_array($header, $import->header_row)) {
-                        $found_at = array_search($header, $import->header_row);
-                        if($i > $found_at) {
-                            //avoid reporting duplicates twice, e.g. "1 is same as 17! 17 is same as 1!!!"
-                            //as well as "1 is same as 1!!!" (which is always true)
-                            //has to be > because otherwise the first result of array_search will always be $i itself(!)
-                            array_push($duplicate_headers,"Duplicate header '$header' detected, first at column: ".($found_at+1).", repeats at column: ".($i+1));
-                        }
-                    }
-                }
-                if(count($duplicate_headers) > 0) {
-                    return response()->json(Helper::formatStandardApiResponse('error',null, implode("; ",$duplicate_headers)), 500); //should this be '4xx'?
-                }
-
-                // Grab the first row to display via ajax as the user picks fields
-                $import->first_row = $reader->fetchOne(1);
-
-                $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);
-                $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);
-        }
-    }
-}
@@ -1,246 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use App\Helpers\Helper;
-use App\Http\Controllers\Controller;
-use App\Http\Transformers\LicenseSeatsTransformer;
-use App\Http\Transformers\LicensesTransformer;
-use App\Models\Company;
-use App\Models\License;
-use App\Models\LicenseSeat;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-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', 'manufacturer', 'freeSeats', 'supplier','category')->withCount('freeSeats'));
-
-
-        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('category_i')) {
-            $licenses->where('category_i','=',$request->input('category_i'));
-        }
-
-        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'));
-        }
-
-
-        if ($request->has('search')) {
-            $licenses = $licenses->TextSearch($request->input('search'));
-        }
-
-
-        $offset = request('offset', 0);
-        $limit = request('limit', 50);
-        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-
-
-        switch ($request->input('sort')) {
-                case 'manufacturer':
-                    $licenses = $licenses->leftJoin('manufacturers', 'licenses.manufacturer_id', '=', 'manufacturers.id')->orderBy('manufacturers.name', $order);
-                break;
-            case 'supplier':
-                $licenses = $licenses->leftJoin('suppliers', 'licenses.supplier_id', '=', 'suppliers.id')->orderBy('suppliers.name', $order);
-                break;
-            case 'category':
-                $licenses = $licenses->leftJoin('categories', 'licenses.category_id', '=', 'categories.id')->orderBy('categories.name', $order);
-                break;
-            case 'company':
-                $licenses = $licenses->leftJoin('companies', 'licenses.company_id', '=', 'companies.id')->orderBy('companies.name', $order);
-                break;
-            default:
-                $allowed_columns = ['id','name','purchase_cost','expiration_date','purchase_order','order_number','notes','purchase_date','serial','company','category','license_name','license_email','free_seats_count','seats'];
-                $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)
-    {
-        //
-        $this->authorize('create', License::class);
-        $license = new License;
-        $license->fill($request->all());
-
-        if($license->save()) {
-            return response()->json(Helper::formatStandardApiResponse('success', $license, trans('admin/licenses/message.create.success')));
-        }
-        return response()->json(Helper::formatStandardApiResponse('error', null, $license->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', License::class);
-        $license = License::findOrFail($id);
-        $license = $license->load('assignedusers', 'licenseSeats.user', 'licenseSeats.asset');
-        return (new LicensesTransformer)->transformLicense($license);
-    }
-
-
-    /**
-     * 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', License::class);
-
-        $license = License::findOrFail($id);
-        $license->fill($request->all());
-
-        if ($license->save()) {
-            return response()->json(Helper::formatStandardApiResponse('success', $license, trans('admin/licenses/message.update.success')));
-        }
-
-        return Helper::formatStandardApiResponse('error', null, $license->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)
-    {
-        //
-        $license = License::findOrFail($id);
-        $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 response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/licenses/message.delete.success')));
-        }
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/licenses/message.assoc_users')));
-    }
-
-    /**
-     * Get license seat listing
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v1.0]
-     * @param int $licenseId
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function seats(Request $request, $licenseId)
-    {
-
-        if ($license = License::find($licenseId)) {
-
-            $seats = LicenseSeat::where('license_id', $licenseId)->with('license', 'user', 'asset');
-
-            $offset = request('offset', 0);
-            $limit = request('limit', 50);
-            $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-
-            $total = $seats->count();
-            $seats = $seats->skip($offset)->take($limit)->get();
-
-            if ($seats) {
-                return (new LicenseSeatsTransformer)->transformLicenseSeats($seats, $total);
-            }
-
-        }
-
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/licenses/message.does_not_exist')), 200);
-
-    }
-
-
-}
@@ -1,194 +0,0 @@
-<?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;
-use App\Http\Transformers\SelectlistTransformer;
-
-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','manager_id','image',
-                'assigned_assets_count','users_count','assets_count','currency'];
-
-        $locations = Location::with('parent', 'manager', 'childLocations')->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.image',
-            'locations.currency'
-        ])->withCount('assignedAssets')
-        ->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';
-
-        switch ($request->input('sort')) {
-            case 'parent':
-                $locations->OrderParent($order);
-                break;
-            case 'manager':
-                $locations->OrderManager($order);
-                break;
-            default:
-                $locations->orderBy($sort, $order);
-                break;
-        }
-
-
-        $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')));
-    }
-
-    /**
-     * Gets a paginated collection for the select2 menus
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v4.0.16]
-     * @see \App\Http\Transformers\SelectlistTransformer
-     *
-     */
-    public function selectlist(Request $request)
-    {
-
-        $locations = Location::select([
-            'locations.id',
-            'locations.name',
-            'locations.image',
-        ]);
-
-        if ($request->has('search')) {
-            $locations = $locations->where('locations.name', 'LIKE', '%'.$request->get('search').'%');
-        }
-
-        $locations = $locations->orderBy('name', 'ASC')->paginate(50);
-
-        // Loop through and set some custom properties for the transformer to use.
-        // This lets us have more flexibility in special cases like assets, where
-        // they may not have a ->name value but we want to display something anyway
-        foreach ($locations as $location) {
-            $location->use_text = $location->name;
-            $location->use_image = ($location->image) ? url('/').'/uploads/locations/'.$location->image : null;
-        }
-
-        return (new SelectlistTransformer)->transformSelectlist($locations);
-
-    }
-
-}
@@ -1,165 +0,0 @@
-<?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;
-use App\Http\Transformers\SelectlistTransformer;
-
-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','image', 'assets_count', 'consumables_count', 'components_count', 'licenses_count'];
-
-        $manufacturers = Manufacturer::select(
-            array('id','name','url','support_url','support_email','support_phone','created_at','updated_at','image', 'deleted_at')
-        )->withCount('assets')->withCount('licenses')->withCount('consumables')->withCount('accessories');
-
-        if ($request->input('deleted')=='true') {
-            $manufacturers->onlyTrashed();
-        }
-
-        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')));
-
-    }
-
-    /**
-     * Gets a paginated collection for the select2 menus
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v4.0.16]
-     * @see \App\Http\Transformers\SelectlistTransformer
-     *
-     */
-    public function selectlist(Request $request)
-    {
-
-        $manufacturers = Manufacturer::select([
-            'id',
-            'name',
-            'image',
-        ]);
-
-        if ($request->has('search')) {
-            $manufacturers = $manufacturers->where('name', 'LIKE', '%'.$request->get('search').'%');
-        }
-
-        $manufacturers = $manufacturers->orderBy('name', 'ASC')->paginate(50);
-
-        // Loop through and set some custom properties for the transformer to use.
-        // This lets us have more flexibility in special cases like assets, where
-        // they may not have a ->name value but we want to display something anyway
-        foreach ($manufacturers as $manufacturer) {
-            $manufacturer->use_text = $manufacturer->name;
-            $manufacturer->use_image = ($manufacturer->image) ? url('/').'/uploads/manufacturers/'.$manufacturer->image : null;
-        }
-
-        return (new SelectlistTransformer)->transformSelectlist($manufacturers);
-
-    }
-}
@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use App\Models\CheckoutRequest;
-use App\Http\Controllers\Controller;
-use Auth;
-use App\Helpers\Helper;
-
-
-class ProfileController extends Controller
-{
-    /**
-     * Display a listing of requested assets.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v4.3.0]
-     *
-     * @return Array
-     */
-    public function requestedAssets()
-    {
-        $checkoutRequests = CheckoutRequest::where('user_id', '=', Auth::user()->id)->get();
-
-        $results = [];
-        $results['total'] = $checkoutRequests->count();
-
-
-        foreach ($checkoutRequests as $checkoutRequest) {
-            $results['rows'][] = [
-                'image' => $checkoutRequest->itemRequested()->present()->getImageUrl(),
-                'name' => $checkoutRequest->itemRequested()->present()->name(),
-                'type' => $checkoutRequest->itemType(),
-                'qty' => $checkoutRequest->quantity,
-                'location' => ($checkoutRequest->location()) ? $checkoutRequest->location()->name : null,
-                'expected_checkin' => Helper::getFormattedDateObject($checkoutRequest->itemRequested()->expected_checkin, 'datetime'),
-                'request_date' => Helper::getFormattedDateObject($checkoutRequest->created_at, 'datetime'),
-            ];
-        }
-        return $results;
-    }
-
-
-}
@@ -1,65 +0,0 @@
-<?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');
-        }
-
-        if ($request->has('uploads')) {
-            $actionlogs = $actionlogs->whereNotNull('filename')->orderBy('created_at', 'desc');
-        }
-
-        $allowed_columns = [
-            'id',
-            'created_at',
-            'target_id',
-            'user_id',
-            'action_type',
-            'note'
-        ];
-        
-        $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)->skip($offset)->take($limit)->get();
-
-        return response()->json((new ActionlogsTransformer)->transformActionlogs($actionlogs, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
-
-    }
-}
@@ -1,148 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Models\Ldap;
-use Validator;
-use App\Models\Setting;
-use Mail;
-use App\Notifications\SlackTest;
-use Notification;
-use App\Notifications\MailTest;
-
-class SettingsController extends Controller
-{
-
-
-    public function ldaptest()
-    {
-
-        if (Setting::getSettings()->ldap_enabled!='1') {
-            \Log::debug('LDAP is not enabled cannot test.');
-            return response()->json(['message' => 'LDAP is not enabled, cannot test.'], 400);
-        }
-
-        \Log::debug('Preparing to test LDAP connection');
-
-        try {
-            $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);
-        }
-
-
-    }
-
-    public function ldaptestlogin(Request $request)
-    {
-
-        if (Setting::getSettings()->ldap_enabled!='1') {
-            \Log::debug('LDAP is not enabled. Cannot test.');
-            return response()->json(['message' => 'LDAP is not enabled, cannot test.'], 400);
-        }
-
-
-        $rules = array(
-            'ldaptest_user' => 'required',
-            'ldaptest_password' => 'required'
-        );
-
-        $validator = Validator::make($request->all(), $rules);
-        if ($validator->fails()) {
-            \Log::debug('LDAP Validation test failed.');
-            $validation_errors = implode(' ',$validator->errors()->all());
-            return response()->json(['message' => $validator->errors()->all()], 400);
-        }
-        
-
-        \Log::debug('Preparing to test LDAP login');
-        try {
-            $connection = Ldap::connectToLdap();
-            try {
-                Ldap::bindAdminToLdap($connection);
-                \Log::debug('Attempting to bind to LDAP for LDAP test');
-                try {
-                    $ldap_user = Ldap::findAndBindUserLdap($request->input('ldaptest_user'), $request->input('ldaptest_password'));
-                    if ($ldap_user) {
-                        \Log::debug('It worked! '. $request->input('ldaptest_user').' successfully binded to LDAP.');
-                        return response()->json(['message' => 'It worked! '. $request->input('ldaptest_user').' successfully binded to LDAP.'], 200);
-                    }
-                    return response()->json(['message' => 'Login Failed. '. $request->input('ldaptest_user').' did not successfully bind to LDAP.'], 400);
-
-                } catch (\Exception $e) {
-                    \Log::debug('LDAP login failed');
-                    return response()->json(['message' => $e->getMessage()], 400);
-                }
-
-            } catch (\Exception $e) {
-                \Log::debug('Bind failed');
-                return response()->json(['message' => $e->getMessage()], 400);
-                //return response()->json(['message' => $e->getMessage()], 500);
-            }
-        } catch (\Exception $e) {
-            \Log::debug('Connection failed');
-            return response()->json(['message' => $e->getMessage()], 500);
-        }
-
-
-    }
-
-
-    public function slacktest()
-    {
-
-        if ($settings = Setting::getSettings()->slack_channel=='') {
-            \Log::debug('Slack is not enabled. Cannot test.');
-            return response()->json(['message' => 'Slack is not enabled, cannot test.'], 400);
-        }
-
-        \Log::debug('Preparing to test slack connection');
-
-        try {
-            Notification::send($settings = Setting::getSettings(), new SlackTest());
-            return response()->json(['message' => 'Success'], 200);
-        } catch (\Exception $e) {
-            \Log::debug('Slack connection failed');
-            return response()->json(['message' => $e->getMessage()], 400);
-        }
-
-
-    }
-
-
-    /**
-     * Test the email configuration
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v3.0]
-     * @return Redirect
-     */
-    public function ajaxTestEmail()
-    {
-        if (!config('app.lock_passwords')) {
-            try {
-                Notification::send(Setting::first(), new MailTest());
-                return response()->json(['message' => 'Mail sent to '.config('mail.reply_to.address')], 200);
-            } catch (Exception $e) {
-                return response()->json(['message' => $e->getMessage()], 500);
-            }
-        }
-        return response()->json(['message' => 'Mail would have been sent, but this application is in demo mode! '], 200);
-
-    }
-
-
-
-}
@@ -1,246 +0,0 @@
-<?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', 'assets_count','color','default_label'];
-
-        $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."]]),500);
-        }
-
-        $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);
-
-        // Check that there are no assets associated
-        if ($statuslabel->assets()->count() == 0) {
-            $statuslabel->delete();
-            return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/statuslabels/message.delete.success')));
-        }
-
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/statuslabels/message.assoc_assets')));
-
-    }
-
-
-
-     /**
-     * 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')->groupBy('id')->withCount('assets')->get();
-
-        $labels=[];
-        $points=[];
-        $colors=[];
-        foreach ($statuslabels as $statuslabel) {
-            if ($statuslabel->assets_count > 0) {
-
-                $labels[]=$statuslabel->name. ' ('.number_format($statuslabel->assets_count).')';
-                $points[]=$statuslabel->assets_count;
-                if ($statuslabel->color!='') {
-                    $colors[]=$statuslabel->color;
-                }
-            }
-        }
-
-        
-        $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';
-    }
-}
@@ -1,174 +0,0 @@
-<?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;
-use App\Http\Transformers\SelectlistTransformer;
-
-
-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','image','assets_count','licenses_count', 'accessories_count'];
-        
-        $suppliers = Supplier::select(
-                array('id','name','address','address2','city','state','country','fax', 'phone','email','contact','created_at','updated_at','deleted_at','image','notes')
-            )->withCount('assets')->withCount('licenses')->withCount('accessories')->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::with('asset_maintenances', 'assets', 'licenses')->withCount('asset_maintenances','assets', 'licenses')->findOrFail($id);
-        $this->authorize('delete', $supplier);
-
-
-        if ($supplier->assets_count > 0) {
-            return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/suppliers/message.delete.assoc_assets', ['asset_count' => (int) $supplier->assets_count])));
-        }
-
-        if ($supplier->asset_maintenances_count > 0) {
-            return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/suppliers/message.delete.assoc_maintenances', ['asset_maintenances_count' => $supplier->asset_maintenances_count])));
-        }
-
-        if ($supplier->licenses_count > 0) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/suppliers/message.delete.assoc_licenses', ['licenses_count' => (int) $supplier->licenses_count])));
-        }
-
-        $supplier->delete();
-        return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/suppliers/message.delete.success')));
-
-    }
-
-    /**
-     * Gets a paginated collection for the select2 menus
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v4.0.16]
-     * @see \App\Http\Transformers\SelectlistTransformer
-     *
-     */
-    public function selectlist(Request $request)
-    {
-
-        $suppliers = Supplier::select([
-            'id',
-            'name',
-            'image',
-        ]);
-
-        if ($request->has('search')) {
-            $suppliers = $suppliers->where('suppliers.name', 'LIKE', '%'.$request->get('search').'%');
-        }
-
-        $suppliers = $suppliers->orderBy('name', 'ASC')->paginate(50);
-
-        // Loop through and set some custom properties for the transformer to use.
-        // This lets us have more flexibility in special cases like assets, where
-        // they may not have a ->name value but we want to display something anyway
-        foreach ($suppliers as $supplier) {
-            $supplier->use_text = $supplier->name;
-            $supplier->use_image = ($supplier->image) ? url('/').'/uploads/suppliers/'.$supplier->image : null;
-        }
-
-        return (new SelectlistTransformer)->transformSelectlist($suppliers);
-
-    }
-
-}
@@ -1,323 +0,0 @@
-<?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;
-use App\Http\Transformers\AssetsTransformer;
-use App\Http\Transformers\SelectlistTransformer;
-
-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.activated',
-            'users.address',
-            'users.avatar',
-            'users.city',
-            'users.company_id',
-            'users.country',
-            'users.created_at',
-            'users.deleted_at',
-            'users.department_id',
-            'users.email',
-            'users.employee_num',
-            'users.first_name',
-            'users.id',
-            'users.jobtitle',
-            'users.last_login',
-            'users.last_name',
-            'users.location_id',
-            'users.manager_id',
-            'users.notes',
-            'users.permissions',
-            'users.phone',
-            'users.state',
-            'users.two_factor_enrolled',
-            'users.updated_at',
-            'users.username',
-            'users.zip',
-
-        ])->with('manager', 'groups', 'userloc', 'company', 'department','assets','licenses','accessories','consumables')
-            ->withCount('assets','licenses','accessories','consumables');
-        $users = Company::scopeCompanyables($users);
-
-
-        if (($request->has('deleted')) && ($request->input('deleted')=='true')) {
-            $users = $users->GetDeleted();
-        }
-
-        if ($request->has('company_id')) {
-            $users = $users->where('users.company_id', '=', $request->input('company_id'));
-        }
-
-        if ($request->has('location_id')) {
-            $users = $users->where('users.location_id', '=', $request->input('location_id'));
-        }
-
-        if ($request->has('group_id')) {
-            $users = $users->ByGroup($request->get('group_id'));
-        }
-
-        if ($request->has('department_id')) {
-            $users = $users->where('users.department_id','=',$request->input('department_id'));
-        }
-
-        if ($request->has('search')) {
-            $users = $users->TextSearch($request->input('search'));
-        }
-
-        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        $offset = request('offset', 0);
-        $limit = request('limit',  20);
-
-        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', 'assets_count', 'licenses_count',
-                        'consumables_count', 'accessories_count', 'phone', 'address', 'city', 'state',
-                        'country', 'zip'
-                    ];
-
-                $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);
-    }
-
-
-    /**
-     * Gets a paginated collection for the select2 menus
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v4.0.16]
-     * @see \App\Http\Transformers\SelectlistTransformer
-     *
-     */
-    public function selectlist(Request $request)
-    {
-
-        $users = User::select(
-            [
-                'users.id',
-                'users.username',
-                'users.employee_num',
-                'users.first_name',
-                'users.last_name',
-                'users.gravatar',
-                'users.avatar',
-                'users.email',
-            ]
-            );
-
-        $users = Company::scopeCompanyables($users);
-
-        if ($request->has('search')) {
-            $users = $users->where('first_name', 'LIKE', '%'.$request->get('search').'%')
-                ->orWhere('last_name', 'LIKE', '%'.$request->get('search').'%')
-                ->orWhere('username', 'LIKE', '%'.$request->get('search').'%')
-                ->orWhere('employee_num', 'LIKE', '%'.$request->get('search').'%');
-        }
-
-        $users = $users->orderBy('last_name', 'asc')->orderBy('first_name', 'asc');
-        $users = $users->paginate(50);
-
-        foreach ($users as $user) {
-            $name_str = '';
-            if ($user->last_name!='') {
-                $name_str .= e($user->last_name).', ';
-            }
-            $name_str .= e($user->first_name);
-
-            if ($user->username!='') {
-                $name_str .= ' ('.e($user->username).')';
-            }
-
-            if ($user->employee_num!='') {
-                $name_str .= ' - #'.e($user->employee_num);
-            }
-
-            $user->use_text = $name_str;
-            $user->use_image = ($user->present()->gravatar) ? $user->present()->gravatar : null;
-        }
-
-        return (new SelectlistTransformer)->transformSelectlist($users);
-
-    }
-
-
-
-    /**
-     * 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());
-
-        $tmp_pass = substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 20);
-        $user->password = bcrypt($request->get('password', $tmp_pass));
-
-        if ($user->save()) {
-            return response()->json(Helper::formatStandardApiResponse('success', (new UsersTransformer)->transformUser($user), trans('admin/users/message.success.create')));
-        }
-        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 ($user->id == $request->input('manager_id')) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot be your own manager'));
-        }
-
-        if ($request->has('password')) {
-            $user->password = bcrypt($request->input('password'));
-        }
-
-        // Update the location of any assets checked out to this user
-        Asset::where('assigned_type', User::class)
-            ->where('assigned_to', $user->id)->update(['location_id' => $request->input('location_id', null)]);
-
-        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 (new AssetsTransformer)->transformAssets($assets, $assets->count());
-    }
-
-    /**
-     * Reset the user's two-factor status
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v3.0]
-     * @param $userId
-     * @return string JSON
-     */
-    public function postTwoFactorReset(Request $request)
-    {
-
-        $this->authorize('edit', User::class);
-
-        if ($request->has('id')) {
-            try {
-                $user = User::find($request->get('id'));
-                $user->two_factor_secret = null;
-                $user->two_factor_enrolled = 0;
-                $user->save();
-                return response()->json(['message' => trans('admin/settings/general.two_factor_reset_success')], 200);
-            } catch (\Exception $e) {
-                return response()->json(['message' => trans('admin/settings/general.two_factor_reset_error')], 500);
-            }
-        }
-        return response()->json(['message' => 'No ID provided'], 500);
-
-    }
-}
@@ -1,313 +0,0 @@
-<?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');
-    }
-
-
-
-    /**
-     *  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()
-    {
-        $asset = null;
-
-        if ($asset = Asset::find(request('asset_id'))) {
-            // We have to set this so that the correct property is set in the select2 ajax dropdown
-            $asset->asset_id = $asset->id;
-        }
-
-        // Prepare Asset Maintenance Type List
-        $assetMaintenanceType = [
-                                    '' => 'Select an asset maintenance type',
-                                ] + AssetMaintenance::getImprovementOptions();
-        // Mark the selected asset, if it came in
-
-        return view('asset_maintenances/edit')
-                   ->with('asset', $asset)
-                   ->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)) && ($asset!=null)) {
-            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('selectedAsset', null)
-                   ->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);
-    }
-}
@@ -1,583 +0,0 @@
-<?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 App\Http\Requests\ImageUploadRequest;
-
-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>]
-    * @since [v1.0]
-    * @return View
-    */
-    public function index()
-    {
-        $this->authorize('index', AssetModel::class);
-        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()
-    {
-        $this->authorize('create', AssetModel::class);
-        $category_type = 'asset';
-        return view('models/edit')->with('category_type',$category_type)
-        ->with('depreciation_list', Helper::depreciationList())
-        ->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(ImageUploadRequest $request)
-    {
-
-        $this->authorize('create', AssetModel::class);
-        // 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_slug($image->getClientOriginalName()) . "." . $image->getClientOriginalExtension();
-            $path = app('models_upload_path');
-
-            if ($image->getClientOriginalExtension()!='svg') {
-                Image::make($image->getRealPath())->resize(500, null, function ($constraint) {
-                    $constraint->aspectRatio();
-                    $constraint->upsize();
-                })->save($path.'/'.$file_name);
-            } else {
-                $image->move($path, $file_name);
-            }
-            $model->image = $file_name;
-
-        }
-
-            // Was it created?
-        if ($model->save()) {
-            if ($this->shouldAddDefaultValues($request->input())) {
-                $this->assignCustomFieldsDefaultValues($model, $request->input('default_values'));
-            }
-
-            // 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
-        $this->authorize('create', AssetModel::class);
-        $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)
-    {
-        $this->authorize('update', AssetModel::class);
-        if ($item = AssetModel::find($modelId)) {
-            $category_type = 'asset';
-            $view = View::make('models/edit', compact('item','category_type'));
-            $view->with('depreciation_list', Helper::depreciationList());
-            return $view;
-        }
-
-        return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));
-
-    }
-
-
-    /**
-    * 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(ImageUploadRequest $request, $modelId = null)
-    {
-        $this->authorize('update', AssetModel::class);
-        // 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         = $request->input('requestable', '0');
-
-        $this->removeCustomFieldsDefaultValues($model);
-
-        if ($request->input('custom_fieldset')=='') {
-            $model->fieldset_id = null;
-        } else {
-            $model->fieldset_id = $request->input('custom_fieldset');
-
-            if ($this->shouldAddDefaultValues($request->input())) {
-                $this->assignCustomFieldsDefaultValues($model, $request->input('default_values'));
-            }
-        }
-
-        $old_image = $model->image;
-
-        // Set the model's image property to null if the image is being deleted
-        if ($request->input('image_delete') == 1) {
-            $model->image = null;
-        }
-
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = $model->id.'-'.str_slug($image->getClientOriginalName()) . "." . $image->getClientOriginalExtension();
-
-            if ($image->getClientOriginalExtension()!='svg') {
-                Image::make($image->getRealPath())->resize(500, null, function ($constraint) {
-                    $constraint->aspectRatio();
-                    $constraint->upsize();
-                })->save(app('models_upload_path').$file_name);
-            } else {
-                $image->move(app('models_upload_path'), $file_name);
-            }
-            $model->image = $file_name;
-
-        }
-
-        if ((($request->file('image')) && (isset($old_image)) && ($old_image!='')) || ($request->input('image_delete') == 1)) {
-            try  {
-                unlink(app('models_upload_path').$old_image);
-            } catch (\Exception $e) {
-                \Log::error($e);
-            }
-        }
-
-
-        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)
-    {
-        $this->authorize('delete', AssetModel::class);
-        // 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'));
-        }
-
-        if ($model->image) {
-            try  {
-                unlink(public_path().'/uploads/models/'.$model->image);
-            } catch (\Exception $e) {
-                \Log::error($e);
-            }
-        }
-
-        // 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)
-    {
-        $this->authorize('create', AssetModel::class);
-        // 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)
-    {
-        $this->authorize('view', AssetModel::class);
-        $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);
-    }
-
-
-
-
-    /**
-     * 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');
-
-        // Make sure some IDs have been selected
-        if ((is_array($models_raw_array)) && (count($models_raw_array) > 0)) {
-
-
-            $models = AssetModel::whereIn('id', $models_raw_array)->withCount('assets')->orderBy('assets_count', 'ASC')->get();
-
-            // If deleting....
-            if ($request->input('bulk_actions')=='delete') {
-                $valid_count = 0;
-                foreach ($models as $model) {
-                    if ($model->assets_count == 0) {
-                        $valid_count++;
-                    }
-                }
-                return view('models/bulk-delete', compact('models'))->with('valid_count', $valid_count);
-
-            // Otherwise display the bulk edit screen
-            } else {
-
-                $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);
-            }
-
-        }
-
-        return redirect()->route('models.index')
-            ->with('error', 'You must select at least one model to edit.');
-
-    }
-
-
-
-    /**
-     * 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'));
-
-    }
-
-    /**
-     * Validate and delete the given Asset Models. 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 postBulkDelete(Request $request)
-    {
-        $models_raw_array = Input::get('ids');
-
-        if ((is_array($models_raw_array)) && (count($models_raw_array) > 0)) {
-
-            $models = AssetModel::whereIn('id', $models_raw_array)->withCount('assets')->get();
-
-            $del_error_count = 0;
-            $del_count = 0;
-
-            foreach ($models as $model) {
-                \Log::debug($model->id);
-
-                if ($model->assets_count > 0) {
-                    $del_error_count++;
-                } else {
-                    $model->delete();
-                    $del_count++;
-                }
-            }
-
-            \Log::debug($del_count);
-            \Log::debug($del_error_count);
-
-            if ($del_error_count == 0) {
-                return redirect()->route('models.index')
-                    ->with('success', trans('admin/models/message.bulkdelete.success',['success_count'=> $del_count] ));
-            }
-
-            return redirect()->route('models.index')
-                ->with('warning', trans('admin/models/message.bulkdelete.success_partial', ['fail_count'=>$del_error_count, 'success_count'=> $del_count]));
-        }
-
-        return redirect()->route('models.index')
-            ->with('error', trans('admin/models/message.bulkdelete.error'));
-
-    }
-
-    /**
-     * Returns true if a fieldset is set, 'add default values' is ticked and if
-     * any default values were entered into the form.
-     *
-     * @param  array  $input
-     * @return boolean
-     */
-    private function shouldAddDefaultValues(array $input)
-    {
-        return !empty($input['add_default_values'])
-            && !empty($input['default_values'])
-            && !empty($input['custom_fieldset']);
-    }
-
-    /**
-     * Adds default values to a model (as long as they are truthy)
-     *
-     * @param  AssetModel $model
-     * @param  array      $defaultValues
-     * @return void
-     */
-    private function assignCustomFieldsDefaultValues(AssetModel $model, array $defaultValues)
-    {
-        foreach ($defaultValues as $customFieldId => $defaultValue) {
-            if ($defaultValue) {
-                $model->defaultValues()->attach($customFieldId, ['default_value' => $defaultValue]);
-            }
-        }
-    }
-
-    /**
-     * Removes all default values
-     *
-     * @return void
-     */
-    private function removeCustomFieldsDefaultValues(AssetModel $model)
-    {
-        $model->defaultValues()->detach();
-    }
-}
@@ -1,72 +0,0 @@
-<?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)]
-        );
-    }
-}
@@ -1,360 +0,0 @@
-<?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']]);
-        \Session::put('backUrl', \URL::previous());
-    }
-
-    function showLoginForm(Request $request)
-    {
-        $this->loginViaRemoteUser($request);
-        if (Auth::check()) {
-            return redirect()->intended('dashboard');
-        }
-
-        if (Setting::getSettings()->login_common_disabled == "1") {
-            return view('errors.403');
-        }
-
-        return view('auth.login');
-    }
-
-    private function loginViaRemoteUser(Request $request)
-    {
-        $remote_user = $request->server('REMOTE_USER');
-        if (Setting::getSettings()->login_remote_user_enabled == "1" && isset($remote_user) && !empty($remote_user)) {
-            LOG::debug("Authenticatiing via REMOTE_USER.");
-            try {
-                $user = User::where('username', '=', $remote_user)->whereNull('deleted_at')->first();
-                LOG::debug("Remote user auth lookup complete");
-                if(!is_null($user)) Auth::login($user, true);
-            } catch(Exception $e) {
-                LOG::error("There was an error authenticating the Remote user: " . $e->getMessage());
-            }
-        }
-    }
-
-    private function loginViaLdap(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)
-    {
-        if (Setting::getSettings()->login_common_disabled == "1") {
-            return view('errors.403');
-        }
-
-        $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->loginViaLdap($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();
-
-        $settings = Setting::getSettings();
-        $customLogoutUrl = $settings->login_remote_user_custom_logout_url ;
-        if ($settings->login_remote_user_enabled == '1' && $customLogoutUrl != '') {
-            return redirect()->away($customLogoutUrl);
-        }
-
-        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');
-    }
-
-    public function redirectTo()
-    {
-        return Session::get('backUrl') ? Session::get('backUrl') :   $this->redirectTo;
-    }
-
-}
@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Foundation\Auth\ResetsPasswords;
-
-class RegisterController extends Controller
-{
-
-    public function __construct()
-    {
-        $this->middleware('guest');
-    }
-
-    public function showRegistrationForm() {
-        abort(404,'Page not found');
-    }
-    
-    public function register() {
-        abort(404,'Page not found');
-    }
-}
@@ -1,39 +0,0 @@
-<?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 = '/';
-
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('guest');
-    }
-}
@@ -1,264 +0,0 @@
-<?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;
-use Image;
-use App\Http\Requests\ImageUploadRequest;
-
-/**
- * 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
-        $this->authorize('view', Category::class);
-        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
-        $this->authorize('create', Category::class);
-         $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(ImageUploadRequest $request)
-    {
-        $this->authorize('create', Category::class);
-        $category = new Category();
-        $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 ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = str_random(25).".".$image->getClientOriginalExtension();
-            $path = public_path('uploads/categories/'.$file_name);
-            Image::make($image->getRealPath())->resize(200, null, function ($constraint) {
-                $constraint->aspectRatio();
-                $constraint->upsize();
-            })->save($path);
-            $category->image = $file_name;
-        }
-
-
-        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)
-    {
-        $this->authorize('edit', Category::class);
-        if (is_null($item = Category::find($categoryId))) {
-            return redirect()->route('categories.index')->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(ImageUploadRequest $request, $categoryId = null)
-    {
-        $this->authorize('edit', Category::class);
-        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');
-
-        $old_image = $category->image;
-
-        // Set the model's image property to null if the image is being deleted
-        if ($request->input('image_delete') == 1) {
-            $category->image = null;
-        }
-
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = $category->id.'-'.str_slug($image->getClientOriginalName()) . "." . $image->getClientOriginalExtension();
-
-            if ($image->getClientOriginalExtension()!='svg') {
-                Image::make($image->getRealPath())->resize(500, null, function ($constraint) {
-                    $constraint->aspectRatio();
-                    $constraint->upsize();
-                })->save(app('categories_upload_path').$file_name);
-            } else {
-                $image->move(app('categories_upload_path'), $file_name);
-            }
-            $category->image = $file_name;
-
-        }
-
-        if ((($request->file('image')) && (isset($old_image)) && ($old_image!='')) || ($request->input('image_delete') == 1)) {
-            try  {
-                unlink(app('categories_upload_path').$old_image);
-            } catch (\Exception $e) {
-                \Log::error($e);
-            }
-        }
-
-
-        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)
-    {
-        $this->authorize('delete', Category::class);
-        // Check if the category exists
-        if (is_null($category = Category::find($categoryId))) {
-            return redirect()->route('categories.index')->with('error', trans('admin/categories/message.not_found'));
-        }
-
-        if ($category->has_models() > 0) {
-            return redirect()->route('categories.index')->with('error', trans('admin/categories/message.assoc_items', ['asset_type'=>'model']));
-        } elseif ($category->accessories()->count() > 0) {
-                return redirect()->route('categories.index')->with('error', trans('admin/categories/message.assoc_items', ['asset_type'=>'accessory']));
-        } elseif ($category->consumables()->count() > 0) {
-                return redirect()->route('categories.index')->with('error', trans('admin/categories/message.assoc_items', ['asset_type'=>'consumable']));
-        } elseif ($category->components()->count() > 0) {
-                return redirect()->route('categories.index')->with('error', trans('admin/categories/message.assoc_items', ['asset_type'=>'component']));
-        }
-
-        $category->delete();
-        // Redirect to the locations management page
-        return redirect()->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)
-    {
-        $this->authorize('view', Category::class);
-        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);
-    }
-
-
-}
@@ -1,197 +0,0 @@
-<?php
-namespace App\Http\Controllers;
-
-use App\Models\Company;
-use Input;
-use Lang;
-use Redirect;
-use View;
-use Illuminate\Http\Request;
-use Image;
-use App\Http\Requests\ImageUploadRequest;
-
-/**
- * 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(ImageUploadRequest $request)
-    {
-        $company = new Company;
-        $company->name = $request->input('name');
-
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = str_random(25).".".$image->getClientOriginalExtension();
-            $path = public_path('uploads/companies/'.$file_name);
-            Image::make($image->getRealPath())->resize(200, null, function ($constraint) {
-                $constraint->aspectRatio();
-                $constraint->upsize();
-            })->save($path);
-            $company->image = $file_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(ImageUploadRequest $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');
-
-        $old_image = $company->image;
-
-        // Set the model's image property to null if the image is being deleted
-        if ($request->input('image_delete') == 1) {
-            $company->image = null;
-        }
-
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = $company->id.'-'.str_slug($image->getClientOriginalName()) . "." . $image->getClientOriginalExtension();
-
-            if ($image->getClientOriginalExtension()!='svg') {
-                Image::make($image->getRealPath())->resize(500, null, function ($constraint) {
-                    $constraint->aspectRatio();
-                    $constraint->upsize();
-                })->save(app('companies_upload_path').$file_name);
-            } else {
-                $image->move(app('companies_upload_path'), $file_name);
-            }
-            $company->image = $file_name;
-
-        }
-
-        if ((($request->file('image')) && (isset($old_image)) && ($old_image!='')) || ($request->input('image_delete') == 1)) {
-            try  {
-                unlink(app('companies_upload_path').$old_image);
-            } catch (\Exception $e) {
-                \Log::error($e);
-            }
-        }
-
-
-        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);
-        }
-
-    }
-}
@@ -1,410 +0,0 @@
-<?php
-namespace App\Http\Controllers;
-
-use App\Helpers\Helper;
-use App\Http\Requests\ImageUploadRequest;
-use App\Models\Actionlog;
-use App\Models\Company;
-use App\Models\Component;
-use App\Models\CustomField;
-use App\Models\Setting;
-use App\Models\User;
-use App\Models\Asset;
-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;
-use Image;
-
-/**
- * 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);
-        $category_type = 'component';
-        return view('components/edit')->with('category_type',$category_type)
-            ->with('item', new Component);
-    }
-
-
-    /**
-    * 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(ImageUploadRequest $request)
-    {
-        $this->authorize('create', Component::class);
-        $component = new Component();
-        $component->name                   = $request->input('name');
-        $component->category_id            = $request->input('category_id');
-        $component->location_id            = $request->input('location_id');
-        $component->company_id             = Company::getIdForCurrentUser($request->input('company_id'));
-        $component->order_number           = $request->input('order_number', null);
-        $component->min_amt                = $request->input('min_amt', null);
-        $component->serial                 = $request->input('serial', null);
-        $component->purchase_date          = $request->input('purchase_date', null);
-        $component->purchase_cost          = $request->input('purchase_cost', null);
-        $component->qty                    = $request->input('qty');
-        $component->user_id                = Auth::id();
-
-
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = str_random(25).".".$image->getClientOriginalExtension();
-            $path = public_path('uploads/components/'.$file_name);
-            Image::make($image->getRealPath())->resize(200, null, function ($constraint) {
-                $constraint->aspectRatio();
-                $constraint->upsize();
-            })->save($path);
-            $component->image = $file_name;
-        }
-
-        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 ($item = Component::find($componentId)) {
-            $this->authorize('update', $item);
-            $category_type = 'component';
-            return view('components/edit', compact('item'))->with('category_type', $category_type);
-        }
-        return redirect()->route('components.index')->with('error', trans('admin/components/message.does_not_exist'));
-
-
-
-
-    }
-
-
-    /**
-    * 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(ImageUploadRequest $request, $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 ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = str_random(25).".".$image->getClientOriginalExtension();
-            $path = public_path('uploads/components/'.$file_name);
-            Image::make($image->getRealPath())->resize(200, null, function ($constraint) {
-                $constraint->aspectRatio();
-                $constraint->upsize();
-            })->save($path);
-            $component->image = $file_name;
-        } elseif ($request->input('image_delete')=='1') {
-            $component->image = null;
-        }
-
-        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.does_not_exist'));
-        }
-
-        $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'));
-    }
-
-    /**
-     * 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'));
-    }
-
-    /**
-     * Returns a view that allows the checkin of a component from an asset.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @see ComponentsController::postCheckout() method that stores the data.
-     * @since [v4.1.4]
-     * @param int $componentId
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function getCheckin($component_asset_id)
-    {
-
-        // This could probably be done more cleanly but I am very tired. - @snipe
-        if ($component_assets = DB::table('components_assets')->find($component_asset_id)) {
-            if (is_null($component = Component::find($component_assets->component_id))) {
-                return redirect()->route('components.index')->with('error', trans('admin/components/messages.not_found'));
-            }
-            if (is_null($asset = Asset::find($component_assets->asset_id))) {
-                return redirect()->route('components.index')->with('error',
-                    trans('admin/components/message.not_found'));
-            }
-            $this->authorize('checkin', $component);
-            return view('components/checkin', compact('component_assets','component','asset'));
-        }
-
-        return redirect()->route('components.index')->with('error', trans('admin/components/messages.not_found'));
-
-    }
-
-    /**
-     * Validate and store checkin data.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @see ComponentsController::getCheckout() method that returns the form.
-     * @since [v4.1.4]
-     * @param Request $request
-     * @param int $componentId
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function postCheckin(Request $request, $component_asset_id)
-    {
-        if ($component_assets = DB::table('components_assets')->find($component_asset_id)) {
-            if (is_null($component = Component::find($component_assets->component_id))) {
-                return redirect()->route('components.index')->with('error',
-                    trans('admin/components/message.not_found'));
-            }
-
-
-            $this->authorize('checkin', $component);
-
-            $max_to_checkin = $component_assets->assigned_qty;
-            $validator = Validator::make($request->all(), [
-                "checkin_qty" => "required|numeric|between:1,$max_to_checkin"
-            ]);
-
-            if ($validator->fails()) {
-                return redirect()->back()
-                    ->withErrors($validator)
-                    ->withInput();
-            }
-
-            // Validation passed, so let's figure out what we have to do here.
-            $qty_remaining_in_checkout = ($component_assets->assigned_qty - (int)$request->input('checkin_qty'));
-
-            // We have to modify the record to reflect the new qty that's
-            // actually checked out.
-            $component_assets->assigned_qty = $qty_remaining_in_checkout;
-            DB::table('components_assets')->where('id',
-                $component_asset_id)->update(['assigned_qty' => $qty_remaining_in_checkout]);
-
-            $log = new Actionlog();
-            $log->user_id = Auth::user()->id;
-            $log->action_type = 'checkin from';
-            $log->target_type = Asset::class;
-            $log->target_id = $component_assets->asset_id;
-            $log->item_id = $component_assets->component_id;
-            $log->item_type = Component::class;
-            $log->note = $request->input('note');
-            $log->save();
-
-            // If the checked-in qty is exactly the same as the assigned_qty,
-            // we can simply delete the associated components_assets record
-            if ($qty_remaining_in_checkout == 0) {
-                DB::table('components_assets')->where('id', '=', $component_asset_id)->delete();
-            }
-
-            return redirect()->route('components.index')->with('success',
-                trans('admin/components/message.checkout.success'));
-        }
-        return redirect()->route('components.index')->with('error', trans('admin/components/message.not_found'));
-    }
-
-
-}
@@ -1,286 +0,0 @@
-<?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 Auth;
-use Config;
-use DB;
-use Input;
-use Lang;
-use Redirect;
-use Slack;
-use Str;
-use View;
-use Gate;
-use Image;
-use App\Http\Requests\ImageUploadRequest;
-
-/**
- * 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);
-        $category_type = 'consumable';
-        return view('consumables/edit')->with('category_type', $category_type)
-            ->with('item', new Consumable);
-    }
-
-
-    /**
-    * 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(ImageUploadRequest $request)
-    {
-        $this->authorize('create', Consumable::class);
-        $consumable = new Consumable();
-        $consumable->name                   = $request->input('name');
-        $consumable->category_id            = $request->input('category_id');
-        $consumable->location_id            = $request->input('location_id');
-        $consumable->company_id             = Company::getIdForCurrentUser($request->input('company_id'));
-        $consumable->order_number           = $request->input('order_number');
-        $consumable->min_amt                = $request->input('min_amt');
-        $consumable->manufacturer_id        = $request->input('manufacturer_id');
-        $consumable->model_number           = $request->input('model_number');
-        $consumable->item_no                = $request->input('item_no');
-        $consumable->purchase_date          = $request->input('purchase_date');
-        $consumable->purchase_cost          = Helper::ParseFloat($request->input('purchase_cost'));
-        $consumable->qty                    = $request->input('qty');
-        $consumable->user_id                = Auth::id();
-
-
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = str_random(25).".".$image->getClientOriginalExtension();
-            $path = public_path('uploads/consumables/'.$file_name);
-            Image::make($image->getRealPath())->resize(200, null, function ($constraint) {
-                $constraint->aspectRatio();
-                $constraint->upsize();
-            })->save($path);
-            $consumable->image = $file_name;
-        }
-
-        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 ($item = Consumable::find($consumableId)) {
-            $this->authorize($item);
-            $category_type = 'consumable';
-            return view('consumables/edit', compact('item'))->with('category_type', $category_type);
-        }
-
-        return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist'));
-
-    }
-
-
-    /**
-    * 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(ImageUploadRequest $request,  $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                   = $request->input('name');
-        $consumable->category_id            = $request->input('category_id');
-        $consumable->location_id            = $request->input('location_id');
-        $consumable->company_id             = Company::getIdForCurrentUser($request->input('company_id'));
-        $consumable->order_number           = $request->input('order_number');
-        $consumable->min_amt                = $request->input('min_amt');
-        $consumable->manufacturer_id        = $request->input('manufacturer_id');
-        $consumable->model_number           = $request->input('model_number');
-        $consumable->item_no                = $request->input('item_no');
-        $consumable->purchase_date          = $request->input('purchase_date');
-        $consumable->purchase_cost          = Helper::ParseFloat(Input::get('purchase_cost'));
-        $consumable->qty                    = Helper::ParseFloat(Input::get('qty'));
-
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = str_random(25).".".$image->getClientOriginalExtension();
-            $path = public_path('uploads/consumables/'.$file_name);
-            Image::make($image->getRealPath())->resize(200, null, function ($constraint) {
-                $constraint->aspectRatio();
-                $constraint->upsize();
-            })->save($path);
-            $consumable->image = $file_name;
-        } elseif ($request->input('image_delete')=='1') {
-            $consumable->image = null;
-        }
-
-        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.index')->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.does_not_exist'));
-        }
-        $this->authorize('checkout', $consumable);
-        return view('consumables/checkout', compact('consumable'));
-    }
-
-    /**
-    * 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('checkout/consumable', $consumable)->with('error', trans('admin/consumables/message.checkout.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();
-
-
-      // Redirect to the new consumable page
-        return redirect()->route('consumables.index')->with('success', trans('admin/consumables/message.checkout.success'));
-
-    }
-
-}
@@ -1,39 +0,0 @@
-<?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());
-    }
-}
@@ -1,192 +0,0 @@
-<?php
-namespace App\Http\Controllers;
-
-use App\Http\Requests\CustomFieldRequest;
-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(CustomFieldRequest $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),
-            "show_in_email" => $request->get("show_in_email", 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"));
-        }
-
-        if ($field->save()) {
-            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'));
-        }
-
-    }
-
-
-    /**
-     * 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(CustomFieldRequest $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");
-        $field->show_in_email = $request->get("show_in_email", 0);
-
-        if (!in_array(Input::get('format'), array_keys(CustomField::$PredefinedFormats))) {
-            $field->format = e($request->get("custom_format"));
-        } else {
-            $field->format = e($request->get("format"));
-        }
-
-        if ($field->save()) {
-           return redirect()->route("fields.index")->with("success", trans('admin/custom_fields/message.field.update.success'));
-        }
-
-        return redirect()->back()->withInput()->with('error', trans('admin/custom_fields/message.field.update.error'));
-    }
-
-
-
-}
@@ -1,182 +0,0 @@
-<?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();
-
-        if ($cfset) {
-            $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);
-        }
-
-        return redirect()->route("fields.index")->with("error", trans('admin/custom_fields/message.fieldset.does_not_exist'));
-
-    }
-
-
-    /**
-    * 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);
-
-        if ($fieldset) {
-            $models = AssetModel::where("fieldset_id", "=", $id);
-            if ($models->count() == 0) {
-                $fieldset->delete();
-                return redirect()->route("fields.index")->with("success", trans('admin/custom_fields/message.fieldset.delete.success'));
-            } else {
-                return redirect()->route("fields.index")->with("error", trans('admin/custom_fields/message.fieldset.delete.in_use'));
-            }
-        }
-
-        return redirect()->route("fields.index")->with("error", trans('admin/custom_fields/message.fieldset.does_not_exist'));
-
-
-    }
-
-
-    /**
-    * 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'));
-    }
-}
@@ -1,52 +0,0 @@
-<?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('migrate', ['--force' => true]);
-                \Artisan::call('passport:install');
-            }
-
-            return view('dashboard')->with('asset_stats', $asset_stats)->with('counts', $counts);
-        } else {
-        // Redirect to the profile page
-            return redirect()->intended('account/view-assets');
-        }
-    }
-}
@@ -1,193 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-use App\Models\Department;
-use App\Helpers\Helper;
-use Auth;
-use Image;
-use App\Http\Requests\ImageUploadRequest;
-
-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);
-        $company = null;
-        if ($request->has('company_id')) {
-            $company = Company::find($request->input('company_id'));
-        }
-        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(ImageUploadRequest $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 ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = str_random(25).".".$image->getClientOriginalExtension();
-            $path = public_path('uploads/departments/'.$file_name);
-            Image::make($image->getRealPath())->resize(200, null, function ($constraint) {
-                $constraint->aspectRatio();
-                $constraint->upsize();
-            })->save($path);
-            $department->image = $file_name;
-        }
-
-        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);
-    }
-
-
-    /**
-     * 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'));
-    }
-
-    public function update(ImageUploadRequest $request, $id) {
-
-        $this->authorize('create', Department::class);
-        if (is_null($department = Department::find($id))) {
-            return redirect()->route('departments.index')->with('error', trans('admin/departments/message.does_not_exist'));
-        }
-
-        $department->fill($request->all());
-        $department->manager_id = ($request->has('manager_id' ) ? $request->input('manager_id') : null);
-
-        $old_image = $department->image;
-
-        // Set the model's image property to null if the image is being deleted
-        if ($request->input('image_delete') == 1) {
-            $department->image = null;
-        }
-
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = $department->id.'-'.str_slug($image->getClientOriginalName()) . "." . $image->getClientOriginalExtension();
-
-            if ($image->getClientOriginalExtension()!='svg') {
-                Image::make($image->getRealPath())->resize(500, null, function ($constraint) {
-                    $constraint->aspectRatio();
-                    $constraint->upsize();
-                })->save(app('departments_upload_path').$file_name);
-            } else {
-                $image->move(app('departments_upload_path'), $file_name);
-            }
-            $department->image = $file_name;
-
-        }
-
-        if ((($request->file('image')) && (isset($old_image)) && ($old_image!='')) || ($request->input('image_delete') == 1)) {
-            try  {
-                unlink(app('departments_upload_path').$old_image);
-            } catch (\Exception $e) {
-                \Log::error($e);
-            }
-        }
-
-        if ($department->save()) {
-            return redirect()->route("departments.index")->with('success', trans('admin/departments/message.update.success'));
-        }
-        return redirect()->back()->withInput()->withErrors($department->getErrors());
-    }
-}
@@ -1,178 +0,0 @@
-<?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'));
-    }
-
-    /**
-     * Returns a view that displays a form to display depreciation listing
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net]
-     * @see DepreciationsController::postEdit()
-     * @param int $depreciationId
-     * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function show($id)
-    {
-        if (is_null($depreciation = Depreciation::find($id))) {
-            // Redirect to the blogs management page
-            return redirect()->route('depreciations.index')->with('error', trans('admin/depreciations/message.does_not_exist'));
-        }
-
-        return view('depreciations/view', compact('depreciation'));
-    }
-
-
-}
@@ -1,170 +0,0 @@
-<?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 = Helper::selectedPermissionsArray($permissions, $permissions);
-        $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)
-    {
-        $group = Group::find($id);
-
-        if ($group) {
-            $permissions = config('permissions');
-            $groupPermissions = $group->decodePermissions();
-            $selected_array = Helper::selectedPermissionsArray($permissions, $groupPermissions);
-            return view('groups.edit', compact('group', 'permissions', 'selected_array', 'groupPermissions'));
-        }
-
-        return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found'));
-    }
-
-    /**
-    * 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'));
-    }
-
-    /**
-     * Returns a view that invokes the ajax tables which actually contains
-     * the content for the group detail page.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param int $locationId
-     * @since [v4.0.11]
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function show($id)
-    {
-        $group = Group::find($id);
-
-        if ($group) {
-            return view('groups/view', compact('group'));
-        }
-
-        return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', compact('id')));
-    }
-
-}
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Http\Transformers\ImportsTransformer;
-use App\Models\Import;
-use Illuminate\Http\Request;
-use App\Models\Asset;
-
-
-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);
-    }
-}
@@ -1,648 +0,0 @@
-<?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('maintained_list', $maintained_list)
-            ->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->category_id       = $request->input('category_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('maintained_list', $maintained_list);
-    }
-
-
-    /**
-     * 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');
-        $license->supplier_id       = $request->input('supplier_id');
-        $license->category_id       = $request->input('category_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($licenceId)
-    {
-        // Check that the license is valid
-        if ($license = License::where('id',$licenceId)->first()) {
-
-            // If the license is valid, check that there is an available seat
-            if ($license->getAvailSeatsCountAttribute() < 1) {
-                return redirect()->route('licenses.index')->with('error', 'There are no available seats for this license');
-            }
-        }
-
-        $this->authorize('checkout', $license);
-        return view('licenses/checkout', compact('license'));
-    }
-
-
-    /**
-     * 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, $licenseId)
-    {
-
-        // Check that the license is valid
-        if ($license = License::where('id',$licenseId)->first()) {
-
-            // If the license is valid, check that there is an available seat
-            if ($license->getAvailSeatsCountAttribute() < 1) {
-                return redirect()->route('licenses.index')->with('error', 'There are no available seats for this license');
-            }
-
-            // Get the next available seat for this license
-            $next = $license->freeSeat();
-
-            if (!$next) {
-                return redirect()->route('licenses.index')->with('error', 'There are no available seats for this license');
-            }
-
-            if (!$licenseSeat = LicenseSeat::where('id', '=', $next->id)->first()) {
-                return redirect()->route('licenses.index')->with('error', 'There are no available seats for this license');
-            }
-
-
-            $this->authorize('checkout', $license);
-
-            // Declare the rules for the form validation
-            $rules = [
-                'note'   => 'string|nullable',
-                '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;
-
-
-            // This item is checked out to a an asset
-            if (request('checkout_to_type')=='asset') {
-                if (is_null($target = Asset::find(request('asset_id')))) {
-                    return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.asset_does_not_exist'));
-                }
-                $licenseSeat->asset_id = $request->input('asset_id');
-
-                // Override asset's assigned user if available
-                if ($target->checkedOutToUser()) {
-                    $licenseSeat->assigned_to =  $target->assigned_to;
-                }
-
-            } else {
-
-                // Fetch the target and set the license user
-                if (is_null($target = User::find(request('assigned_to')))) {
-                    return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.user_does_not_exist'));
-                }
-                $licenseSeat->assigned_to = request('assigned_to');
-            }
-
-            $licenseSeat->user_id = Auth::user()->id;
-
-
-            if ($licenseSeat->save()) {
-                $licenseSeat->logCheckout($request->input('note'), $target);
-                return redirect()->route("licenses.index")->with('success', trans('admin/licenses/message.checkout.success'));
-            }
-
-        }
-        return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.not_found'));
-
-
-
-
-        return redirect()->route("licenses.index")->with('error', trans('admin/licenses/message.checkout.error'));
-    }
-
-
-    /**
-    * 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'));
-        }
-
-        if (is_null($license = License::find($licenseSeat->license_id))) {
-            // Redirect to the asset management page with error
-            return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.not_found'));
-        }
-
-
-        $this->authorize('checkout', $license);
-        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('checkout', $license);
-
-        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::with('assignedusers', 'licenseSeats.user', 'licenseSeats.asset')->find($licenseId);
-
-        if ($license) {
-            $this->authorize('view', $license);
-            return view('licenses/view', compact('license'));
-        }
-        return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist', compact('id')));
-    }
-    
-
-    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('item', $license)
-        ->with('maintained_list', $maintained_list);
-    }
-
-
-    /**
-    * 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(Request $request, $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'
-                    );
-                    $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).'-'.str_slug(basename($file->getClientOriginalName(), '.'.$extension)).'.'.$extension;
-                    $upload_success = $file->move($destinationPath, $filename);
-
-                    //Log the upload to the log
-                    $license->logUpload($filename, e($request->input('notes')));
-                }
-                // This being called from a modal seems to confuse redirect()->back()
-                // It thinks we should go to the dashboard.  As this is only used
-                // from the modal at present, hardcode the redirect.  Longterm
-                // maybe we evaluate something else.
-                if ($upload_success) {
-                    return redirect()->route('licenses.show', $license->id)->with('success', trans('admin/licenses/message.upload.success'));
-                }
-                return redirect()->route('licenses.show', $license->id)->with('error', trans('admin/licenses/message.upload.error'));
-            }
-            return redirect()->route('licenses.show', $license->id)->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, $download = true)
-    {
-
-        $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');
-
-
-            if ($file =='') {
-                return response('File not found on server', 404)
-                    ->header('Content-Type', 'text/plain');
-            }
-
-            $mimetype = \File::mimeType($file);
-
-
-            if (!file_exists($file)) {
-                return response('File '.$file.' not found on server', 404)
-                    ->header('Content-Type', 'text/plain');
-            }
-
-            if ($download != 'true') {
-                if ($contents = file_get_contents($file)) {
-                    return Response::make($contents)->header('Content-Type', $mimetype);
-                }
-                return JsonResponse::create(["error" => "Failed validation: "], 500);
-            }
-            return Response::download($file);
-        }
-
-
-        return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist', compact('id')));
-    }
-
-
-
-    /**
-    * 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);
-    }
-}
@@ -1,305 +0,0 @@
-<?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;
-use Image;
-use App\Http\Requests\ImageUploadRequest;
-
-/**
- * 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
-        $this->authorize('view', Location::class);
-        $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()
-    {
-        $this->authorize('create', Location::class);
-        $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);
-    }
-
-
-    /**
-    * 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(ImageUploadRequest $request)
-    {
-        $this->authorize('create', Location::class);
-        $location = new Location();
-        $location->name             = $request->input('name');
-        $location->parent_id        = $request->input('parent_id', null);
-        $location->currency         = $request->input('currency', '$');
-        $location->address          = $request->input('address');
-        $location->address2         = $request->input('address2');
-        $location->city             = $request->input('city');
-        $location->state            = $request->input('state');
-        $location->country          = $request->input('country');
-        $location->zip              = $request->input('zip');
-        $location->ldap_ou          = $request->input('ldap_ou');
-        $location->manager_id       = $request->input('manager_id');
-        $location->user_id          = Auth::id();
-
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = str_random(25).".".$image->getClientOriginalExtension();
-            $path = public_path('uploads/locations/'.$file_name);
-            Image::make($image->getRealPath())->resize(600, null, function ($constraint) {
-                $constraint->aspectRatio();
-                $constraint->upsize();
-            })->save($path);
-            $location->image = $file_name;
-        }
-
-        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(Request $request)
-    {
-        $this->authorize('create', Location::class);
-        $new['currency']=Setting::first()->default_currency;
-
-        // create a new location instance
-        $location = new Location();
-
-        // Save the location data
-        $location->name               = $request->input('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               = $request->input('city');
-        $location->state          = '';//e(Input::get('state'));
-        $location->country            = $request->input('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)
-    {
-        $this->authorize('edit', Location::class);
-        // Check if the location exists
-        if (is_null($item = Location::find($locationId))) {
-            return redirect()->route('locations.index')->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(ImageUploadRequest $request, $locationId = null)
-    {
-        $this->authorize('edit', Location::class);
-        // Check if the location exists
-        if (is_null($location = Location::find($locationId))) {
-            return redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist'));
-        }
-
-        // Update the location data
-        $location->name         = $request->input('name');
-        $location->parent_id    = $request->input('parent_id', null);
-        $location->currency     = $request->input('currency', '$');
-        $location->address      = $request->input('address');
-        $location->address2     = $request->input('address2');
-        $location->city         = $request->input('city');
-        $location->state        = $request->input('state');
-        $location->country      = $request->input('country');
-        $location->zip          = $request->input('zip');
-        $location->ldap_ou      = $request->input('ldap_ou');
-        $location->manager_id   = $request->input('manager_id');
-
-        $old_image = $location->image;
-
-        // Set the model's image property to null if the image is being deleted
-        if ($request->input('image_delete') == 1) {
-            $location->image = null;
-        }
-
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = $location->id.'-'.str_slug($image->getClientOriginalName()) . "." . $image->getClientOriginalExtension();
-
-            if ($image->getClientOriginalExtension()!='svg') {
-                Image::make($image->getRealPath())->resize(600, null, function ($constraint) {
-                    $constraint->aspectRatio();
-                    $constraint->upsize();
-                })->save(app('locations_upload_path').$file_name);
-            } else {
-                $image->move(app('locations_upload_path'), $file_name);
-            }
-            $location->image = $file_name;
-
-        }
-
-        if ((($request->file('image')) && (isset($old_image)) && ($old_image!='')) || ($request->input('image_delete') == 1)) {
-            try  {
-                unlink(app('locations_upload_path').$old_image);
-            } catch (\Exception $e) {
-                \Log::error($e);
-            }
-        }
-
-
-        if ($location->save()) {
-            return redirect()->route("locations.index")->with('success', trans('admin/locations/message.update.success'));
-        }
-        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)
-    {
-        $this->authorize('delete', Location::class);
-        if (is_null($location = Location::find($locationId))) {
-            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'));
-        }
-
-        return redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist', compact('id')));
-    }
-
-}
@@ -1,274 +0,0 @@
-<?php
-namespace App\Http\Controllers;
-
-use App\Helpers\Helper;
-use App\Http\Requests\ImageUploadRequest;
-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;
-use Image;
-
-/**
- * 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()
-    {
-        $this->authorize('index', Manufacturer::class);
-        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()
-    {
-        $this->authorize('create', Manufacturer::class);
-        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(ImageUploadRequest $request)
-    {
-
-        $this->authorize('create', Manufacturer::class);
-        $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 ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = str_slug($image->getClientOriginalName()).".".$image->getClientOriginalExtension();
-            $path = public_path('uploads/manufacturers/'.$file_name);
-            Image::make($image->getRealPath())->resize(200, null, function ($constraint) {
-                $constraint->aspectRatio();
-                $constraint->upsize();
-            })->save($path);
-            $manufacturer->image = $file_name;
-        }
-
-
-
-        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)
-    {
-        $this->authorize('edit', Manufacturer::class);
-        // 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(ImageUploadRequest $request, $manufacturerId = null)
-    {
-        $this->authorize('edit', Manufacturer::class);
-        // 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');
-
-        $old_image = $manufacturer->image;
-
-        // Set the model's image property to null if the image is being deleted
-        if ($request->input('image_delete') == 1) {
-            $manufacturer->image = null;
-        }
-
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = $manufacturer->id.'-'.str_slug($image->getClientOriginalName()) . "." . $image->getClientOriginalExtension();
-
-            if ($image->getClientOriginalExtension()!='svg') {
-                Image::make($image->getRealPath())->resize(500, null, function ($constraint) {
-                    $constraint->aspectRatio();
-                    $constraint->upsize();
-                })->save(app('manufacturers_upload_path').$file_name);
-            } else {
-                $image->move(app('manufacturers_upload_path'), $file_name);
-            }
-            $manufacturer->image = $file_name;
-
-        }
-
-        if ((($request->file('image')) && (isset($old_image)) && ($old_image!='')) || ($request->input('image_delete') == 1)) {
-            try  {
-                unlink(app('manufacturers_upload_path').$old_image);
-            } catch (\Exception $e) {
-                \Log::error($e);
-            }
-        }
-
-
-        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)
-    {
-        $this->authorize('delete', Manufacturer::class);
-        // 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'));
-        }
-
-        if ($manufacturer->image) {
-            try  {
-                unlink(public_path().'/uploads/manufacturers/'.$manufacturer->image);
-            } catch (\Exception $e) {
-                \Log::error($e);
-            }
-        }
-
-
-        // 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 via API.
-    * This data contains a listing of all assets that belong to that manufacturer.
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @param int $manufacturerId
-    * @since [v1.0]
-    * @return \Illuminate\Contracts\View\View
-     */
-    public function show($manufacturerId = null)
-    {
-        $this->authorize('view', Manufacturer::class);
-        $manufacturer = Manufacturer::find($manufacturerId);
-
-        if (isset($manufacturer->id)) {
-            return view('manufacturers/view', compact('manufacturer'));
-        }
-
-        $error = trans('admin/manufacturers/message.does_not_exist');
-        // Redirect to the user management page
-        return redirect()->route('manufacturers.index')->with('error', $error);
-    }
-
-    /**
-     * Restore a given Manufacturer (mark as un-deleted)
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v4.1.15]
-     * @param int $manufacturers_id
-     * @return Redirect
-     */
-    public function restore($manufacturers_id)
-    {
-        $this->authorize('create', Manufacturer::class);
-        $manufacturer = Manufacturer::onlyTrashed()->where('id',$manufacturers_id)->first();
-
-        if ($manufacturer) {
-
-            // Not sure why this is necessary - it shouldn't fail validation here, but it fails without this, so....
-            $manufacturer->setValidating(false);
-            if ($manufacturer->restore()) {
-                return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.restore.success'));
-            }
-            return redirect()->back()->with('error', 'Could not restore.');
-        }
-        return redirect()->back()->with('error', trans('admin/manufacturers/message.does_not_exist'));
-
-    }
-
-   
-
-
-}
@@ -1,41 +0,0 @@
-<?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');
-    }
-
-    function category() {
-        return view('modals.category');
-    }
-
-    function manufacturer() {
-        return view('modals.manufacturer');
-    }
-
-}
@@ -1,167 +0,0 @@
-<?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;
-use App\Http\Requests\ImageUploadRequest;
-
-/**
- * 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();
-        return view('account/profile', compact('user'));
-    }
-
-    /**
-    * Validates and stores the user's update data.
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @since [v1.0]
-    * @return \Illuminate\Http\RedirectResponse
-     */
-    public function postIndex(ImageUploadRequest $request)
-    {
-
-        $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', trans('admin/users/table.lock_passwords'));
-        }
-
-        $user = Auth::user();
-        if ($user->ldap_import=='1') {
-            return redirect()->route('account.password.index')->with('error', trans('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);
-
-
-    }
-
-    /**
-     * Save the menu state of open/closed when the user clicks on the hamburger
-     * menu.
-     *
-     * This URL is triggered via jquery in
-     * resources/views/layouts/default.blade.php
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v4.0]
-     * @return View
-     */
-
-    public function getMenuState(Request $request) {
-        if ($request->input('state')=='open') {
-            $request->session()->put('menu_state', 'open');
-        } else {
-            $request->session()->put('menu_state', 'closed');
-        }
-    }
-
-
-}
@@ -1,913 +0,0 @@
-<?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\Depreciation;
-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;
-use Illuminate\Http\Request;
-
-/**
- * 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;
-    }
-
-    /**
-    * Show depreciation report for assets.
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @since [v1.0]
-    * @return View
-    */
-    public function getDeprecationReport()
-    {
-
-        $depreciations = Depreciation::get();
-        // Grab all the assets
-        $assets = Asset::with( 'assignedTo', 'assetstatus', 'defaultLoc', 'location', 'assetlog', 'company', 'model.category', 'model.depreciation')
-                       ->orderBy('created_at', 'DESC')->get();
-
-        return view('reports/depreciation', compact('assets'))->with('depreciations',$depreciations);
-    }
-
-    /**
-    * 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->location )) {
-                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->location) {
-                $currency = e($asset->location->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(Request $request)
-    {
-
-        \Debugbar::disable();
-        $customfields = CustomField::get();
-        $response = new StreamedResponse(function () use ($customfields, $request) {
-
-            // Open output stream
-            $handle = fopen('php://output', 'w');
-            
-            if ($request->has('use_bom')) {
-                fprintf($handle, chr(0xEF) . chr(0xBB) . chr(0xBF));
-            }
-
-            $header = [];
-
-
-            if ($request->has('company')) {
-                $header[] = trans('general.company');
-            }
-
-            if ($request->has('asset_name')) {
-                $header[] = trans('admin/hardware/form.name');
-            }
-
-            if ($request->has('asset_tag')) {
-                $header[] = trans('admin/hardware/table.asset_tag');
-            }
-
-            if ($request->has('model')) {
-                $header[] = trans('admin/hardware/form.model');
-                $header[] = trans('general.model_no');
-            }
-
-            if ($request->has('category')) {
-                $header[] = trans('general.category');
-            }
-
-            if ($request->has('manufacturer')) {
-                $header[] = trans('admin/hardware/form.manufacturer');
-            }
-
-            if ($request->has('serial')) {
-                $header[] = trans('admin/hardware/table.serial');
-            }
-            if ($request->has('purchase_date')) {
-                $header[] = trans('admin/hardware/table.purchase_date');
-            }
-
-            if (($request->has('purchase_cost'))  || ($request->has('depreciation'))) {
-                $header[] = trans('admin/hardware/table.purchase_cost');
-            }
-
-            if ($request->has('eol')) {
-                $header[] = trans('admin/hardware/table.eol');
-            }
-
-            if ($request->has('order')) {
-                $header[] = trans('admin/hardware/form.order');
-            }
-
-            if ($request->has('supplier')) {
-                $header[] = trans('general.supplier');
-            }
-
-            if ($request->has('location')) {
-                $header[] = trans('admin/hardware/table.location');
-            }
-            if ($request->has('location_address')) {
-                $header[] = trans('general.address');
-                $header[] = trans('general.address');
-                $header[] = trans('general.city');
-                $header[] = trans('general.state');
-                $header[] = trans('general.country');
-                $header[] = trans('general.zip');
-            }
-
-            if ($request->has('rtd_location')) {
-                $header[] = trans('admin/hardware/form.default_location');
-            }
-            
-            if ($request->has('rtd_location_address')) {
-                $header[] = trans('general.address');
-                $header[] = trans('general.address');
-                $header[] = trans('general.city');
-                $header[] = trans('general.state');
-                $header[] = trans('general.country');
-                $header[] = trans('general.zip');
-            }
-
-
-            if ($request->has('assigned_to')) {
-                $header[] = trans('admin/hardware/table.checkoutto');
-                $header[] = trans('general.type');
-            }
-
-            if ($request->has('username')) {
-                $header[] = 'Username';
-            }
-
-            if ($request->has('employee_num')) {
-                $header[] = 'Employee No.';
-            }
-
-            if ($request->has('department')) {
-                $header[] = trans('general.department');
-            }
-
-            if ($request->has('status')) {
-                $header[] = trans('general.status');
-            }
-
-            if ($request->has('warranty')) {
-                $header[] = 'Warranty';
-                $header[] = 'Warranty Expires';
-            }
-            if ($request->has('depreciation')) {
-                $header[] = 'Value';
-                $header[] = 'Diff';
-            }
-
-            if ($request->has('checkout_date')) {
-                $header[] = trans('admin/hardware/table.checkout_date');
-            }
-
-            if ($request->has('expected_checkin')) {
-                $header[] = trans('admin/hardware/form.expected_checkin');
-            }
-
-            if ($request->has('created_at')) {
-                $header[] = trans('general.created_at');
-            }
-
-            if ($request->has('updated_at')) {
-                $header[] = trans('general.updated_at');
-            }
-
-            if ($request->has('last_audit_date')) {
-                $header[] = trans('general.last_audit');
-            }
-
-            if ($request->has('next_audit_date')) {
-                $header[] = trans('general.next_audit_date');
-            }
-
-            if ($request->has('notes')) {
-                $header[] = trans('general.notes');
-            }
-
-
-            foreach ($customfields as $customfield) {
-                if (e(Input::get($customfield->db_column_name())) == '1') {
-                    $header[] = $customfield->name;
-                }
-            }
-
-
-            fputcsv($handle, $header);
-
-            $assets = \App\Models\Company::scopeCompanyables(Asset::select('assets.*'))->with(
-                'location', 'assetstatus', 'assetlog', 'company', 'defaultLoc','assignedTo',
-                'model.category', 'model.manufacturer','supplier');
-            
-            if ($request->has('by_location_id')) {
-                $assets->where('assets.location_id', $request->input('by_location_id'));
-            }
-
-            if ($request->has('by_rtd_location_id')) {
-                \Log::debug('RTD location should match: '.$request->input('by_rtd_location_id'));
-                $assets->where('assets.rtd_location_id', $request->input('by_rtd_location_id'));
-            }
-
-            if ($request->has('by_supplier_id')) {
-                $assets->where('assets.supplier_id', $request->input('by_supplier_id'));
-            }
-
-            if ($request->has('by_company_id')) {
-                $assets->where('assets.company_id', $request->input('by_company_id'));
-            }
-
-            if ($request->has('by_model_id')) {
-                $assets->where('assets.model_id', $request->input('by_model_id'));
-            }
-
-            if ($request->has('by_category_id')) {
-                $assets->InCategory($request->input('by_category_id'));
-            }
-
-            if ($request->has('by_manufacturer_id')) {
-                $assets->ByManufacturer($request->input('by_manufacturer_id'));
-            }
-
-            if ($request->has('by_order_number')) {
-                $assets->where('assets.order_number', $request->input('by_order_number'));
-            }
-
-            if ($request->has('by_status_id')) {
-                $assets->where('assets.status_id', $request->input('by_status_id'));
-            }
-
-            if (($request->has('purchase_start')) && ($request->has('purchase_end'))) {
-                $assets->whereBetween('assets.purchase_date', [$request->input('purchase_start'), $request->input('purchase_end')]);
-            }
-
-            if (($request->has('created_start')) && ($request->has('created_end'))) {
-                $assets->whereBetween('assets.created_at', [$request->input('created_start'), $request->input('created_end')]);
-            }
-
-            if (($request->has('expected_checkin_start')) && ($request->has('expected_checkin_end'))) {
-                $assets->whereBetween('assets.expected_checkin', [$request->input('expected_checkin_start'), $request->input('expected_checkin_end')]);
-            }
-            
-            $assets->orderBy('assets.created_at', 'ASC')->chunk(500, function($assets) use($handle, $customfields, $request) {
-
-                foreach ($assets as $asset) {
-                    $row = [];
-                    
-                    if ($request->has('company')) {
-                        $row[] = ($asset->company) ? $asset->company->name : '';
-                    }
-
-                    if ($request->has('asset_name')) {
-                        $row[] = ($asset->name) ? $asset->name : '';
-                    }
-
-                    if ($request->has('asset_tag')) {
-                        $row[] = ($asset->asset_tag) ? $asset->asset_tag : '';
-                    }
-
-                    if ($request->has('model')) {
-                        $row[] = ($asset->model) ? $asset->model->name : '';
-                        $row[] = ($asset->model) ? $asset->model->model_number : '';
-                    }
-
-                    if ($request->has('category')) {
-                        $row[] = (($asset->model) && ($asset->model->category)) ? $asset->model->category->name : '';
-                    }
-
-                    if ($request->has('manufacturer')) {
-                        $row[] = ($asset->model && $asset->model->manufacturer) ? $asset->model->manufacturer->name : '';
-                    }
-
-                    if ($request->has('serial')) {
-                        $row[] = ($asset->serial) ? $asset->serial : '';
-                    }
-
-                    if ($request->has('purchase_date')) {
-                        $row[] = ($asset->purchase_date) ? $asset->purchase_date : '';
-                    }
-
-                    if ($request->has('purchase_cost')) {
-                        $row[] = ($asset->purchase_cost) ? Helper::formatCurrencyOutput($asset->purchase_cost) : '';
-                    }
-
-                    if ($request->has('eol')) {
-                        $row[] = ($asset->purchase_date!='') ? $asset->present()->eol_date() : '';
-                    }
-
-                    if ($request->has('order')) {
-                        $row[] = ($asset->order_number) ? $asset->order_number : '';
-                    }
-
-                    if ($request->has('supplier')) {
-                        $row[] = ($asset->supplier) ? $asset->supplier->name : '';
-                    }
-                    
-
-                    if ($request->has('location')) {
-                        $row[] = ($asset->location) ? $asset->location->present()->name() : '';
-                    }
-
-                    if ($request->has('location_address')) {
-                        $row[] = ($asset->location) ? $asset->location->address : '';
-                        $row[] = ($asset->location) ? $asset->location->address2 : '';
-                        $row[] = ($asset->location) ? $asset->location->city : '';
-                        $row[] = ($asset->location) ? $asset->location->state : '';
-                        $row[] = ($asset->location) ? $asset->location->country : '';
-                        $row[] = ($asset->location) ? $asset->location->zip : '';
-                    }
-
-                    if ($request->has('rtd_location')) {
-                        $row[] = ($asset->defaultLoc) ? $asset->defaultLoc->present()->name() : '';
-                    }
-
-                    if ($request->has('rtd_location_address')) {
-                        $row[] = ($asset->defaultLoc) ? $asset->defaultLoc->address : '';
-                        $row[] = ($asset->defaultLoc) ? $asset->defaultLoc->address2 : '';
-                        $row[] = ($asset->defaultLoc) ? $asset->defaultLoc->city : '';
-                        $row[] = ($asset->defaultLoc) ? $asset->defaultLoc->state : '';
-                        $row[] = ($asset->defaultLoc) ? $asset->defaultLoc->country : '';
-                        $row[] = ($asset->defaultLoc) ? $asset->defaultLoc->zip : '';
-                    }
-
-
-                    if ($request->has('assigned_to')) {
-                        $row[] = ($asset->checkedOutToUser() && $asset->assigned) ? e($asset->assigned->getFullNameAttribute()) : ($asset->assigned ? e($asset->assigned->display_name) : '');
-                        $row[] = ($asset->checkedOutToUser() && $asset->assigned) ? 'user' : e($asset->assignedType());
-                    }
-
-                    if ($request->has('username')) {
-                        // Only works if we're checked out to a user, not anything else.
-                        if ($asset->checkedOutToUser()) {
-                            $row[] = ($asset->assignedto) ? $asset->assignedto->username : '';
-                        } else {
-                            $row[] = ''; // Empty string if unassigned
-                        }
-                    }
-
-                    if ($request->has('employee_num')) {
-                        // Only works if we're checked out to a user, not anything else.
-                        if ($asset->checkedOutToUser()) {
-                            $row[] = ($asset->assignedto) ? $asset->assignedto->employee_num : '';
-                        } else {
-                            $row[] = ''; // Empty string if unassigned
-                        }
-                    }
-
-
-                    if ($request->has('department')) {
-                        if ($asset->checkedOutToUser()) {
-                            $row[] = (($asset->assignedto) && ($asset->assignedto->department)) ? $asset->assignedto->department->name : '';
-                        } else {
-                            $row[] = ''; // Empty string if unassigned
-                        }
-                    }
-
-                    if ($request->has('status')) {
-                        $row[] = ($asset->assetstatus) ? $asset->assetstatus->name.' ('.$asset->present()->statusMeta.')' : '';
-                    }
-
-
-                    if ($request->has('warranty')) {
-                        $row[] = ($asset->warranty_months) ? $asset->warranty_months : '';
-                        $row[] = $asset->present()->warrantee_expires();
-                    }
-
-
-                    if ($request->has('depreciation')) {
-                            $depreciation = $asset->getDepreciatedValue();
-                            $diff = ($asset->purchase_cost - $depreciation);
-                            $row[]        = Helper::formatCurrencyOutput($depreciation);
-                            $row[]        = Helper::formatCurrencyOutput($diff);
-                    }
-
-                    if ($request->has('checkout_date')) {
-                        $row[] = ($asset->last_checkout) ? $asset->last_checkout : '';
-                    }
-
-                    if ($request->has('expected_checkin')) {
-                        $row[] = ($asset->expected_checkin) ? $asset->expected_checkin : '';
-                    }
-
-                    if ($request->has('created_at')) {
-                        $row[] = ($asset->created_at) ? $asset->created_at : '';
-                    }
-
-                    if ($request->has('updated_at')) {
-                        $row[] = ($asset->updated_at) ? $asset->updated_at : '';
-                    }
-
-                    if ($request->has('last_audit_date')) {
-                        $row[] = ($asset->last_audit_date) ? $asset->last_audit_date : '';
-                    }
-
-                    if ($request->has('next_audit_date')) {
-                        $row[] = ($asset->next_audit_date) ? $asset->next_audit_date : '';
-                    }
-
-                    if ($request->has('notes')) {
-                        $row[] = ($asset->notes) ? $asset->notes : '';
-                    }
-
-                    foreach ($customfields as $customfield) {
-                        $column_name = $customfield->db_column_name();
-                        if ($request->has($customfield->db_column_name())) {
-                            $row[] = $asset->$column_name;
-                        }
-                    }
-                    fputcsv($handle, $row);
-                }
-            });
-
-            // Close the output stream
-            fclose($handle);
-        }, 200, [
-            'Content-Type' => 'text/csv',
-            'Content-Disposition'
-            => 'attachment; filename="custom-assets-report-'.date('Y-m-d-his').'.csv"',
-        ]);
-
-        return $response;
-
-
-    }
-
-
-    /**
-     * 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();
-    }
-}
@@ -1,222 +0,0 @@
-<?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()
-    {
-        $this->authorize('view', Statuslabel::class);
-        return view('statuslabels.index', compact('statuslabels'));
-    }
-
-    public function show($id)
-    {
-        $this->authorize('view', Statuslabel::class);
-        if ($statuslabel = Statuslabel::find($id)) {
-            return view('statuslabels.view')->with('statuslabel', $statuslabel);
-        }
-
-        return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.does_not_exist', compact('id')));
-    }
-
-
-
-    /**
-     * Statuslabel create.
-     *
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function create()
-    {
-        // Show the page
-        $this->authorize('create', Statuslabel::class);
-        $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)
-    {
-
-        $this->authorize('create', Statuslabel::class);
-        // 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);
-        $statusLabel->default_label       =  Input::get('default_label', 0);
-
-
-        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)
-    {
-        $this->authorize('create', Statuslabel::class);
-        $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)
-    {
-        $this->authorize('update', Statuslabel::class);
-        // 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)
-    {
-        $this->authorize('update', Statuslabel::class);
-        // 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);
-        $statuslabel->default_label          =  Input::get('default_label', 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)
-    {
-        $this->authorize('delete', Statuslabel::class);
-        // Check if the Statuslabel exists
-        if (is_null($statuslabel = Statuslabel::find($statuslabelId))) {
-            return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.not_found'));
-        }
-
-        // Check that there are no assets associated
-        if ($statuslabel->assets()->count() == 0) {
-            $statuslabel->delete();
-            return redirect()->route('statuslabels.index')->with('success', trans('admin/statuslabels/message.delete.success'));
-        }
-
-        return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.assoc_assets'));
-    }
-
-}
@@ -1,264 +0,0 @@
-<?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 App\Http\Requests\ImageUploadRequest;
-
-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
-        $this->authorize('view', Supplier::class);
-        $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()
-    {
-        $this->authorize('create', Supplier::class);
-        return view('suppliers/edit')->with('item', new Supplier);
-    }
-
-
-    /**
-     * Supplier create form processing.
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function store(ImageUploadRequest $request)
-    {
-        $this->authorize('create', Supplier::class);
-        // 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 ($request->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(200, null, function ($constraint) {
-                $constraint->aspectRatio();
-                $constraint->upsize();
-            })->save($path);
-            $supplier->image = $file_name;
-        }
-
-        if ($supplier->save()) {
-            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)
-    {
-        $this->authorize('create', Supplier::class);
-        $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)
-    {
-        $this->authorize('edit', Supplier::class);
-        // 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, ImageUploadRequest $request)
-    {
-        $this->authorize('edit', Supplier::class);
-        // 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');
-
-
-        $old_image = $supplier->image;
-
-        // Set the model's image property to null if the image is being deleted
-        if ($request->input('image_delete') == 1) {
-            $supplier->image = null;
-        }
-
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = $supplier->id.'-'.str_slug($image->getClientOriginalName()) . "." . $image->getClientOriginalExtension();
-
-            if ($image->getClientOriginalExtension()!='svg') {
-                Image::make($image->getRealPath())->resize(500, null, function ($constraint) {
-                    $constraint->aspectRatio();
-                    $constraint->upsize();
-                })->save(app('suppliers_upload_path').$file_name);
-            } else {
-                $image->move(app('suppliers_upload_path'), $file_name);
-            }
-            $supplier->image = $file_name;
-
-        }
-
-        if ((($request->file('image')) && (isset($old_image)) && ($old_image!='')) || ($request->input('image_delete') == 1)) {
-            try  {
-                unlink(app('suppliers_upload_path').$old_image);
-            } catch (\Exception $e) {
-                \Log::error($e);
-            }
-        }
-
-
-        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)
-    {
-        $this->authorize('delete', Supplier::class);
-        if (is_null($supplier = Supplier::with('asset_maintenances', 'assets', 'licenses')->withCount('asset_maintenances','assets','licenses')->find($supplierId))) {
-            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.not_found'));
-        }
-
-
-        if ($supplier->assets_count > 0) {
-            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.delete.assoc_assets', ['asset_count' => (int) $supplier->assets_count]));
-        }
-
-        if ($supplier->asset_maintenances_count > 0) {
-            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.delete.assoc_maintenances', ['asset_maintenances_count' => $supplier->asset_maintenances_count]));
-        }
-
-        if ($supplier->licenses_count > 0) {
-            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.delete.assoc_licenses', ['licenses_count' => (int) $supplier->licenses_count]));
-        }
-
-        $supplier->delete();
-        return redirect()->route('suppliers.index')->with('success',
-            trans('admin/suppliers/message.delete.success')
-        );
-
-
-    }
-
-
-    /**
-     *  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.index')->with('error', $error);
-    }
-
-}
@@ -1,333 +0,0 @@
-<?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 App\Notifications\RequestAssetNotification;
-use App\Notifications\RequestAssetCancelationNotification;
-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.index')->with('error', $error);
-        }
-
-    }
-
-
-    public function getRequestableIndex()
-    {
-
-        $assets = Asset::with('model', 'defaultLoc', 'location', 'assignedTo', 'requests')->Hardware()->RequestableAssets()->get();
-        $models = AssetModel::with('category', 'requests', 'assets')->RequestableModels()->get();
-
-        return view('account/requestable-assets', compact('user', 'assets', 'models'));
-    }
-
-
-
-    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();
-
-
-        $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['item_quantity'] = Input::has('request-quantity') ? e(Input::get('request-quantity')) : 1;
-        $data['requested_by'] = $user->present()->fullName();
-        $data['item'] = $item;
-        $data['item_type'] = $itemType;
-        $data['target'] = Auth::user();
-
-
-        if ($fullItemType == Asset::class) {
-            $data['item_url'] = route('hardware.show', $item->id);
-        } else {
-            $data['item_url'] = route("view/${itemType}", $item->id);
-
-        }
-
-        $settings = Setting::getSettings();
-
-        if ($item_request = $item->isRequestedBy($user)) {
-           $item->cancelRequest();
-           $data['item_quantity'] = $item_request->qty;
-           $logaction->logaction('request_canceled');
-
-            if (($settings->alert_email!='')  && ($settings->alerts_enabled=='1') && (!config('app.lock_passwords'))) {
-                $settings->notify(new RequestAssetCancelationNotification($data));
-            }
-
-            return redirect()->route('requestable-assets')->with('success')->with('success', trans('admin/hardware/message.requests.canceled'));
-
-        } else {
-            $item->request();
-            if (($settings->alert_email!='')  && ($settings->alerts_enabled=='1') && (!config('app.lock_passwords'))) {
-                $logaction->logaction('requested');
-                $settings->notify(new RequestAssetNotification($data));
-            }
-
-
-
-            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))) {
-            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'));
-        }
-
-        $data['item'] = $asset;
-        $data['target'] =  Auth::user();
-        $data['item_quantity'] = 1;
-        $settings = Setting::getSettings();
-
-        $logaction = new Actionlog();
-        $logaction->item_id = $data['asset_id'] = $asset->id;
-        $logaction->item_type = $data['item_type'] = Asset::class;
-        $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;
-
-
-        // If it's already requested, cancel the request.
-        if ($asset->isRequestedBy(Auth::user())) {
-            $asset->cancelRequest();
-            $asset->decrement('requests_counter', 1);
-            
-            $logaction->logaction('request canceled');
-            $settings->notify(new RequestAssetCancelationNotification($data));
-            return redirect()->route('requestable-assets')
-                ->with('success')->with('success', trans('admin/hardware/message.requests.cancel-success'));
-        } else {
-
-            $logaction->logaction('requested');
-            $asset->request();
-            $asset->increment('requests_counter', 1);
-            $settings->notify(new RequestAssetNotification($data));
-
-
-            return redirect()->route('requestable-assets')->with('success')->with('success', trans('admin/hardware/message.requests.success'));
-        }
-
-
-    }
-
-    public function getRequestedAssets()
-    {
-        return view('account/requested');
-    }
-
-
-    // Get the acceptance screen
-    public function getAcceptAsset($logID = null)
-    {
-
-        $findlog = Actionlog::where('id', $logID)->first();
-
-        if (!$findlog) {
-            return redirect()->to('account/view-assets')->with('error', 'No matching record.');
-        }
-
-        if ($findlog->accepted_id!='') {
-            return redirect()->to('account/view-assets')->with('error', trans('admin/users/message.error.asset_already_accepted'));
-        }
-
-        $user = Auth::user();
-
-
-        // TODO - Fix this for non-assets
-        if (($findlog->item_type==Asset::class) && ($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 (($findlog->item_type==Asset::class) && ($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));
-
-        if (($findlog->item_id!='') && ($findlog->item_type==Asset::class)) {
-            $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 ');
-        }
-    }
-}
--- a/Show More
+++ b/Show More