Netsyms/HelenaExpressApp
2
0
Fork 0
Code Issues Pull Requests Releases 15 Wiki Activity

Fix barcode detection

Browse Source
This commit is contained in:
Skylar Ittner 2021-01-22 19:33:09 -07:00
parent 36bab31f7b
commit cb06dcdbfb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/assets/js/track.js
View File

@ -27,13 +27,14 @@ function addTrackingSuggestions() {
function openTrackingBarcodeScanner() { function openTrackingBarcodeScanner() {
scanBarcode(function (result) { scanBarcode(function (result) {
var code = ""; var code = "";
var coderegex = /^[0-9a-zA-Z]{5,40}$/;
if (result.startsWith("https://helena.express/track#")) { if (result.startsWith("https://helena.express/track#")) {
code = result.split("#")[1]; code = result.split("#")[1];
} else if (result.startsWith("http") && result.includes("#")) { } else if (result.startsWith("http") && result.includes("#")) {
if (result.split("#")[1].test(/^[0-9a-zA-Z]{5,40}$/)) { if (coderegex.test(result.split("#")[1])) {
code = result.split("#")[1]; code = result.split("#")[1];
} }
} else if (result.test(/^[0-9a-zA-Z]{5,40}$/)) { } else if (coderegex.test(result)) {
code = result; code = result;
} else { } else {
app.dialog.alert("This app can't understand what's in that barcode.", "Error"); app.dialog.alert("This app can't understand what's in that barcode.", "Error");