From 6cf5426540903f599434a2cf6e1d1ad4544519f9 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 25 Nov 2020 11:00:28 -0800
Subject: [PATCH 1/5] Removed unused validation rule

---
 app/Models/Setting.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Models/Setting.php b/app/Models/Setting.php
index 8384d142b..150e290c7 100755
--- a/app/Models/Setting.php
+++ b/app/Models/Setting.php
@@ -48,7 +48,6 @@ class Setting extends Model
     protected $rules = [
           'brand'                               => 'required|min:1|numeric',
           'qr_text'                             => 'max:31|nullable',
-          'logo_img'                            => 'mimes:jpeg,bmp,png,gif',
           'alert_email'                         => 'email_array|nullable',
           'admin_cc_email'                      => 'email|nullable',
           'default_currency'                    => 'required',

From 705dd34f3e6dfd3cf79fd83a1486908c08bbac77 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 27 Nov 2020 18:14:32 -0800
Subject: [PATCH 2/5] Removed older SAML fields

---
 app/Console/Commands/ResetDemoSettings.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/Console/Commands/ResetDemoSettings.php b/app/Console/Commands/ResetDemoSettings.php
index 80e6bc173..89fd5a5ac 100644
--- a/app/Console/Commands/ResetDemoSettings.php
+++ b/app/Console/Commands/ResetDemoSettings.php
@@ -66,9 +66,6 @@ class ResetDemoSettings extends Command
         $settings->version_footer = 'on';
         $settings->support_footer = null;
         $settings->saml_enabled = '0';
-        $settings->saml_sp_entitiyid = '0';
-        $settings->saml_sp_acs_url = null;
-        $settings->saml_sp_sls_url = null;
         $settings->saml_sp_x509cert = null;
         $settings->saml_idp_metadata = null;
         $settings->saml_attr_mapping_username = null;
@@ -84,7 +81,7 @@ class ResetDemoSettings extends Command
             $user->save();
         }
 
-        
+
     }
 
 }

From 985f3658becf1ec9335084bfb162c6a500c4da9b Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 27 Nov 2020 18:17:09 -0800
Subject: [PATCH 3/5] Added wider logo

---
 public/img/demo/{logo.png => snipe-logo.png} | Bin
 public/img/demo/snnipe-logo-lg.png           | Bin 0 -> 17588 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename public/img/demo/{logo.png => snipe-logo.png} (100%)
 create mode 100644 public/img/demo/snnipe-logo-lg.png

diff --git a/public/img/demo/logo.png b/public/img/demo/snipe-logo.png
similarity index 100%
rename from public/img/demo/logo.png
rename to public/img/demo/snipe-logo.png
diff --git a/public/img/demo/snnipe-logo-lg.png b/public/img/demo/snnipe-logo-lg.png
new file mode 100644
index 0000000000000000000000000000000000000000..a33581ec752377eb8b3f1156c0986039d16aa4dc
GIT binary patch
literal 17588
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
Q$p8QV07*qoM6N<$f-y@!y#N3J

literal 0
HcmV?d00001


From f9dcf0783a8756f82f2b00e5d28a894b566adb88 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 28 Nov 2020 16:58:02 -0800
Subject: [PATCH 4/5] Added phantomjs to package.json

---
 package-lock.json | 418 +++++++++++++++++++++++++++++++++++++++++++---
 package.json      |   1 +
 2 files changed, 399 insertions(+), 20 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f798283c3..0303b8d7c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -274,14 +274,12 @@
     "ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
     },
     "ansi-styles": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "dev": true
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
     },
     "anymatch": {
       "version": "2.0.0",
@@ -463,7 +461,6 @@
       "version": "2.6.3",
       "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
       "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
-      "dev": true,
       "requires": {
         "lodash": "^4.17.14"
       }
@@ -1411,6 +1408,39 @@
         "file-uri-to-path": "1.0.0"
       }
     },
+    "bl": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz",
+      "integrity": "sha1-/FQhoo/UImA2w7OJGmaiW8ZNIm4=",
+      "requires": {
+        "readable-stream": "~2.0.5"
+      },
+      "dependencies": {
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+          "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
+        },
+        "readable-stream": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
+          "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~1.0.6",
+            "string_decoder": "~0.10.x",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+        }
+      }
+    },
     "block-stream": {
       "version": "0.0.9",
       "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
@@ -1514,6 +1544,14 @@
         "multicast-dns-service-types": "^1.1.0"
       }
     },
+    "boom": {
+      "version": "2.10.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+      "requires": {
+        "hoek": "2.x.x"
+      }
+    },
     "bootstrap": {
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
@@ -2008,7 +2046,6 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
       "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "dev": true,
       "requires": {
         "ansi-styles": "^2.2.1",
         "escape-string-regexp": "^1.0.2",
@@ -2639,6 +2676,14 @@
       "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=",
       "dev": true
     },
+    "cryptiles": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+      "requires": {
+        "boom": "2.x.x"
+      }
+    },
     "crypto-browserify": {
       "version": "3.12.0",
       "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
@@ -3494,8 +3539,7 @@
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "escodegen": {
       "version": "1.14.3",
@@ -3873,6 +3917,70 @@
         "webpack-sources": "^1.0.1"
       }
     },
+    "extract-zip": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.5.0.tgz",
+      "integrity": "sha1-ksz22B73Cp+kwXRxFMzvbYaIpsQ=",
+      "requires": {
+        "concat-stream": "1.5.0",
+        "debug": "0.7.4",
+        "mkdirp": "0.5.0",
+        "yauzl": "2.4.1"
+      },
+      "dependencies": {
+        "concat-stream": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz",
+          "integrity": "sha1-U/fUPFHF5D+ByP3QMyHGMb5o1hE=",
+          "requires": {
+            "inherits": "~2.0.1",
+            "readable-stream": "~2.0.0",
+            "typedarray": "~0.0.5"
+          }
+        },
+        "debug": {
+          "version": "0.7.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz",
+          "integrity": "sha1-BuHqgILCyxTjmAbiLi9vdX+Srzk="
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+        },
+        "mkdirp": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+          "integrity": "sha1-HXMHam35hs2TROFecfzAWkyavxI=",
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+          "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
+        },
+        "readable-stream": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
+          "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~1.0.6",
+            "string_decoder": "~0.10.x",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+        }
+      }
+    },
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
@@ -3918,6 +4026,14 @@
         "websocket-driver": ">=0.5.1"
       }
     },
+    "fd-slicer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
+      "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
+      "requires": {
+        "pend": "~1.2.0"
+      }
+    },
     "file-loader": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.11.2.tgz",
@@ -4769,6 +4885,22 @@
         "globule": "^1.0.0"
       }
     },
+    "generate-function": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz",
+      "integrity": "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==",
+      "requires": {
+        "is-property": "^1.0.2"
+      }
+    },
+    "generate-object-property": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
+      "requires": {
+        "is-property": "^1.0.0"
+      }
+    },
     "get-assigned-identifiers": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz",
@@ -4951,7 +5083,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
       "requires": {
         "ansi-regex": "^2.0.0"
       }
@@ -5043,6 +5174,26 @@
         "minimalistic-assert": "^1.0.1"
       }
     },
+    "hasha": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz",
+      "integrity": "sha1-eNfL/B5tZjA/55g3NlmEUXsvbuE=",
+      "requires": {
+        "is-stream": "^1.0.1",
+        "pinkie-promise": "^2.0.0"
+      }
+    },
+    "hawk": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+      "requires": {
+        "boom": "2.x.x",
+        "cryptiles": "2.x.x",
+        "hoek": "2.x.x",
+        "sntp": "1.x.x"
+      }
+    },
     "he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -5059,6 +5210,11 @@
         "minimalistic-crypto-utils": "^1.0.1"
       }
     },
+    "hoek": {
+      "version": "2.16.3",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
+    },
     "home-or-tmp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
@@ -5618,6 +5774,23 @@
         "is-extglob": "^2.1.1"
       }
     },
+    "is-my-ip-valid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz",
+      "integrity": "sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ=="
+    },
+    "is-my-json-valid": {
+      "version": "2.20.5",
+      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.5.tgz",
+      "integrity": "sha512-VTPuvvGQtxvCeghwspQu1rBgjYUT6FGxPlvFKbYuFtgc4ADsX3U5ihZOYN0qyU6u+d4X9xXb0IT5O6QpXKt87A==",
+      "requires": {
+        "generate-function": "^2.0.0",
+        "generate-object-property": "^1.1.0",
+        "is-my-ip-valid": "^1.0.0",
+        "jsonpointer": "^4.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
     "is-number": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -5681,6 +5854,11 @@
         "isobject": "^3.0.1"
       }
     },
+    "is-property": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
+      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ="
+    },
     "is-regex": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
@@ -5698,8 +5876,7 @@
     "is-stream": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-      "dev": true
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
     },
     "is-string": {
       "version": "1.0.5",
@@ -5756,8 +5933,7 @@
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
     },
     "isobject": {
       "version": "3.0.1",
@@ -5969,6 +6145,11 @@
       "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
       "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA="
     },
+    "jsonpointer": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.1.0.tgz",
+      "integrity": "sha512-CXcRvMyTlnR53xMcKnuMzfCA5i/nfblTnnr74CZb6C4vG39eu6w51t7nKmU5MfLfbTgGItliNyjO/ciNPDqClg=="
+    },
     "jspdf": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/jspdf/-/jspdf-2.1.1.tgz",
@@ -6056,6 +6237,7 @@
           "integrity": "sha512-J9X76xnncMw+wIqb15HeWfPMqPwYxSpPY8yWPJ7rAZN/ZDzFkjCSZObryCyUe8zbrVRNiuCnIeQteCzMn7GnWw==",
           "requires": {
             "canvg": "1.5.3",
+            "file-saver": "github:eligrey/FileSaver.js#1.3.8",
             "html2canvas": "1.0.0-alpha.12",
             "omggif": "1.0.7",
             "promise-polyfill": "8.1.0",
@@ -6064,7 +6246,7 @@
           "dependencies": {
             "file-saver": {
               "version": "github:eligrey/FileSaver.js#e865e37af9f9947ddcced76b549e27dc45c1cb2e",
-              "from": "github:eligrey/FileSaver.js#e865e37af9f9947ddcced76b549e27dc45c1cb2e"
+              "from": "github:eligrey/FileSaver.js#1.3.8"
             }
           }
         },
@@ -6094,6 +6276,11 @@
         "jquery": ">=1.5"
       }
     },
+    "kew": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz",
+      "integrity": "sha1-edk9LTM2PW/dKXCzNdkUGtWR15s="
+    },
     "keyv": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz",
@@ -6114,6 +6301,14 @@
       "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true
     },
+    "klaw": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
+      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
+      "requires": {
+        "graceful-fs": "^4.1.9"
+      }
+    },
     "labeled-stream-splicer": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz",
@@ -6284,8 +6479,7 @@
     "lodash": {
       "version": "4.17.20",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-      "dev": true
+      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
     },
     "lodash._baseassign": {
       "version": "3.2.0",
@@ -7520,11 +7714,159 @@
         "sha.js": "^2.4.8"
       }
     },
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
+    },
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
+    "phantomjs": {
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/phantomjs/-/phantomjs-2.1.7.tgz",
+      "integrity": "sha1-xpEPZ5NcNyhbYRQyn8LyfV8+MTQ=",
+      "requires": {
+        "extract-zip": "~1.5.0",
+        "fs-extra": "~0.26.4",
+        "hasha": "^2.2.0",
+        "kew": "~0.7.0",
+        "progress": "~1.1.8",
+        "request": "~2.67.0",
+        "request-progress": "~2.0.1",
+        "which": "~1.2.2"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+          "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ="
+        },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+          "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
+        },
+        "caseless": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
+          "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c="
+        },
+        "form-data": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz",
+          "integrity": "sha1-rjFduaSQf6BlUCMEpm13M0de43w=",
+          "requires": {
+            "async": "^2.0.1",
+            "combined-stream": "^1.0.5",
+            "mime-types": "^2.1.11"
+          }
+        },
+        "fs-extra": {
+          "version": "0.26.7",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz",
+          "integrity": "sha1-muH92UiXeY7at20JGM9C0MMYT6k=",
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^2.1.0",
+            "klaw": "^1.0.0",
+            "path-is-absolute": "^1.0.0",
+            "rimraf": "^2.2.8"
+          }
+        },
+        "har-validator": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
+          "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
+          "requires": {
+            "chalk": "^1.1.1",
+            "commander": "^2.9.0",
+            "is-my-json-valid": "^2.12.4",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+          "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+          "requires": {
+            "assert-plus": "^0.2.0",
+            "jsprim": "^1.2.2",
+            "sshpk": "^1.7.0"
+          }
+        },
+        "jsonfile": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+          "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+          "requires": {
+            "graceful-fs": "^4.1.6"
+          }
+        },
+        "node-uuid": {
+          "version": "1.4.8",
+          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
+          "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc="
+        },
+        "oauth-sign": {
+          "version": "0.8.2",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+          "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
+        },
+        "qs": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.1.tgz",
+          "integrity": "sha1-gB/uAw4LlFDWOFrcSKTMVbRK7fw="
+        },
+        "request": {
+          "version": "2.67.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.67.0.tgz",
+          "integrity": "sha1-ivdHgOK/EeoK6aqWXBHxGv0nJ0I=",
+          "requires": {
+            "aws-sign2": "~0.6.0",
+            "bl": "~1.0.0",
+            "caseless": "~0.11.0",
+            "combined-stream": "~1.0.5",
+            "extend": "~3.0.0",
+            "forever-agent": "~0.6.1",
+            "form-data": "~1.0.0-rc3",
+            "har-validator": "~2.0.2",
+            "hawk": "~3.1.0",
+            "http-signature": "~1.1.0",
+            "is-typedarray": "~1.0.0",
+            "isstream": "~0.1.2",
+            "json-stringify-safe": "~5.0.1",
+            "mime-types": "~2.1.7",
+            "node-uuid": "~1.4.7",
+            "oauth-sign": "~0.8.0",
+            "qs": "~5.2.0",
+            "stringstream": "~0.0.4",
+            "tough-cookie": "~2.2.0",
+            "tunnel-agent": "~0.4.1"
+          }
+        },
+        "tough-cookie": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz",
+          "integrity": "sha1-yDoYMPTl7wuT7yo0iOck+N4Basc="
+        },
+        "tunnel-agent": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us="
+        },
+        "which": {
+          "version": "1.2.14",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz",
+          "integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=",
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
     "pify": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
@@ -8853,6 +9195,11 @@
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
     },
+    "progress": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
+      "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74="
+    },
     "promise": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
@@ -9332,6 +9679,14 @@
         "uuid": "^3.3.2"
       }
     },
+    "request-progress": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz",
+      "integrity": "sha1-XTa7V5YcZzqlt4jbyBQf3yO0Tgg=",
+      "requires": {
+        "throttleit": "^1.0.0"
+      }
+    },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -9481,7 +9836,6 @@
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
       "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
       "requires": {
         "glob": "^7.1.3"
       }
@@ -10157,6 +10511,14 @@
         }
       }
     },
+    "sntp": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+      "requires": {
+        "hoek": "2.x.x"
+      }
+    },
     "sockjs": {
       "version": "0.3.19",
       "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
@@ -10601,11 +10963,15 @@
         "safe-buffer": "~5.2.0"
       }
     },
+    "stringstream": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz",
+      "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA=="
+    },
     "strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
       "requires": {
         "ansi-regex": "^2.0.0"
       }
@@ -10655,8 +11021,7 @@
     "supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "dev": true
+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
     },
     "svg-pathdata": {
       "version": "5.0.5",
@@ -10740,6 +11105,11 @@
       "resolved": "https://registry.npmjs.org/tether/-/tether-1.4.7.tgz",
       "integrity": "sha512-Z0J1aExjoFU8pybVkQAo/vD2wfSO63r+XOPfWQMC5qtf1bI7IWqNk4MiyBcgvvnY8kqnY06dVdvwTK2S3PU/Fw=="
     },
+    "throttleit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
+      "integrity": "sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw="
+    },
     "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -11965,6 +12335,14 @@
           "dev": true
         }
       }
+    },
+    "yauzl": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
+      "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
+      "requires": {
+        "fd-slicer": "~1.0.1"
+      }
     }
   }
 }
diff --git a/package.json b/package.json
index 790c3ec2c..bf03bab57 100644
--- a/package.json
+++ b/package.json
@@ -47,6 +47,7 @@
     "less-loader": "^4.1.0",
     "list.js": "^1.5.0",
     "papaparse": "^4.3.3",
+    "phantomjs": "^2.1.7",
     "select2": "4.0.13",
     "tableexport.jquery.plugin": "^1.10.20",
     "tether": "^1.4.0",

From 4882b01787f30518e1992ed8bddb233b82826254 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 30 Nov 2020 12:54:15 -0800
Subject: [PATCH 5/5] Added purchase order and order number to user > licenses
 view

---
 resources/views/users/view.blade.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index bb7816474..a7394eb6c 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -423,8 +423,10 @@
               <thead>
                 <tr>
                   <th class="col-md-5">{{ trans('general.name') }}</th>
-                  <th class="col-md-6">{{ trans('admin/hardware/form.serial') }}</th>
-                  <th class="col-md-6" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.purchase_cost') }}</th>
+                  <th>{{ trans('admin/hardware/form.serial') }}</th>
+                  <th data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.purchase_cost') }}</th>
+                  <th>{{ trans('admin/licenses/form.purchase_order') }}</th>
+                  <th>{{ trans('general.order_number') }}</th>
                   <th class="col-md-1 hidden-print">{{ trans('general.action') }}</th>
                 </tr>
               </thead>
@@ -442,7 +444,13 @@
                     @endcan
                   </td>
                   <td class="col-md-2">
-                    {!! $license->purchase_cost !!}
+                    {{ $license->purchase_cost }}
+                  </td>
+                  <td>
+                    {{ $license->purchase_order }}
+                  </td>
+                  <td>
+                    {{ $license->order_number }}
                   </td>
                   <td class="hidden-print col-md-2">
                     @can('update', $license)