From c946f480381056a10c2d34a65ca9b47e3aa19285 Mon Sep 17 00:00:00 2001 From: eta Date: Sat, 14 Jan 2023 12:19:02 +0000 Subject: [PATCH] add support for brfares, discount decoding, other stuff --- rsp6-webshite/discounts.json | 1337 +++++++++++++++++++++++++++++++ rsp6-webshite/index.html | 7 +- rsp6-webshite/index.js | 78 +- rsp6-webshite/webpack.config.js | 10 +- 4 files changed, 1418 insertions(+), 14 deletions(-) create mode 100644 rsp6-webshite/discounts.json diff --git a/rsp6-webshite/discounts.json b/rsp6-webshite/discounts.json new file mode 100644 index 0000000..e64d7ee --- /dev/null +++ b/rsp6-webshite/discounts.json @@ -0,0 +1,1337 @@ +{ + "0": { + "id": 0, + "code": null, + "desc": null + }, + "1": { + "id": 1, + "code": null, + "desc": "CHILD" + }, + "2": { + "id": 2, + "code": null, + "desc": "NA" + }, + "3": { + "id": 3, + "code": "YNG", + "desc": "16-25 Railcard" + }, + "4": { + "id": 4, + "code": null, + "desc": "CORPA" + }, + "5": { + "id": 5, + "code": "VET", + "desc": "Veterans Railcard" + }, + "6": { + "id": 6, + "code": "SRN", + "desc": "Senior Railcard" + }, + "7": { + "id": 7, + "code": null, + "desc": "CORPC" + }, + "8": { + "id": 8, + "code": null, + "desc": "CON25" + }, + "9": { + "id": 9, + "code": "FAM", + "desc": "Family & Friends Railcard" + }, + "10": { + "id": 10, + "code": "FAM", + "desc": "Family & Friends Railcard" + }, + "11": { + "id": 11, + "code": "B2B", + "desc": "CS B2B Discount" + }, + "12": { + "id": 12, + "code": "HMF", + "desc": "HM Forces Railcard" + }, + "13": { + "id": 13, + "code": "HMF", + "desc": "HM Forces Railcard" + }, + "14": { + "id": 14, + "code": "C50", + "desc": "Club 50" + }, + "15": { + "id": 15, + "code": null, + "desc": "PRIV" + }, + "16": { + "id": 16, + "code": "PRV", + "desc": "Staff Travel Card" + }, + "17": { + "id": 17, + "code": null, + "desc": "NA" + }, + "18": { + "id": 18, + "code": "DCT", + "desc": "DISCOUNT AUTHORITY" + }, + "19": { + "id": 19, + "code": "DCT", + "desc": "DISCOUNT AUTHORITY" + }, + "20": { + "id": 20, + "code": "OC5", + "desc": "Club 50 Web - ScotRail" + }, + "21": { + "id": 21, + "code": null, + "desc": "LOCRC" + }, + "22": { + "id": 22, + "code": "DCR", + "desc": "Devon & Cornwall Railcard" + }, + "23": { + "id": 23, + "code": "UTF", + "desc": "Under 25 Advance" + }, + "24": { + "id": 24, + "code": null, + "desc": "LOCAL" + }, + "25": { + "id": 25, + "code": "EVC", + "desc": "Esk Valley Railcard" + }, + "26": { + "id": 26, + "code": null, + "desc": "CON30" + }, + "27": { + "id": 27, + "code": null, + "desc": "LACON" + }, + "28": { + "id": 28, + "code": "LCS", + "desc": "LEICESTER CONCESSION" + }, + "29": { + "id": 29, + "code": null, + "desc": "AV40" + }, + "30": { + "id": 30, + "code": "GS3", + "desc": "GroupSave Discount" + }, + "31": { + "id": 31, + "code": null, + "desc": "ATOC" + }, + "32": { + "id": 32, + "code": "ENC", + "desc": "ENCTP 34% DISCOUNT" + }, + "33": { + "id": 33, + "code": null, + "desc": "NA" + }, + "34": { + "id": 34, + "code": null, + "desc": "ATOC" + }, + "35": { + "id": 35, + "code": null, + "desc": "AV50" + }, + "36": { + "id": 36, + "code": "NGC", + "desc": "Annual Gold Card" + }, + "37": { + "id": 37, + "code": "NGC", + "desc": "Annual Gold Card" + }, + "38": { + "id": 38, + "code": null, + "desc": "AV20" + }, + "39": { + "id": 39, + "code": "TAD", + "desc": "Travel Agent Discount" + }, + "40": { + "id": 40, + "code": "TAD", + "desc": "Travel Agent Discount" + }, + "41": { + "id": 41, + "code": "HBD", + "desc": "HOMEBUILDERS 10%" + }, + "42": { + "id": 42, + "code": "2TR", + "desc": "Two Together Railcard" + }, + "43": { + "id": 43, + "code": "TST", + "desc": "26-30 Railcard" + }, + "44": { + "id": 44, + "code": "W34", + "desc": "DISCOUNT 34" + }, + "45": { + "id": 45, + "code": "HCS", + "desc": "N LINCS CONC 50" + }, + "46": { + "id": 46, + "code": "HCC", + "desc": "N LINCS CONC 34" + }, + "47": { + "id": 47, + "code": null, + "desc": "AV50" + }, + "48": { + "id": 48, + "code": "NEW", + "desc": "Network Railcard" + }, + "49": { + "id": 49, + "code": "NEW", + "desc": "Network Railcard" + }, + "50": { + "id": 50, + "code": "TSU", + "desc": "16-17 Saver" + }, + "51": { + "id": 51, + "code": "EDU", + "desc": "EDUCATIONAL CONCESS." + }, + "52": { + "id": 52, + "code": "EDU", + "desc": "EDUCATIONAL CONCESS." + }, + "53": { + "id": 53, + "code": null, + "desc": "AV75" + }, + "54": { + "id": 54, + "code": null, + "desc": "JUV" + }, + "55": { + "id": 55, + "code": null, + "desc": "CHANG" + }, + "56": { + "id": 56, + "code": "L34", + "desc": "NE Lincs Concession 34" + }, + "57": { + "id": 57, + "code": "JCP", + "desc": "Jobcentre Plus Discount Card" + }, + "58": { + "id": 58, + "code": null, + "desc": "AV15" + }, + "59": { + "id": 59, + "code": null, + "desc": "AV20" + }, + "60": { + "id": 60, + "code": null, + "desc": "GROUP" + }, + "61": { + "id": 61, + "code": null, + "desc": "GR CH" + }, + "62": { + "id": 62, + "code": null, + "desc": "CORPA" + }, + "63": { + "id": 63, + "code": null, + "desc": "DSB" + }, + "64": { + "id": 64, + "code": null, + "desc": "CHDSB" + }, + "65": { + "id": 65, + "code": null, + "desc": "CAV15" + }, + "66": { + "id": 66, + "code": "MOD", + "desc": "Warrant" + }, + "67": { + "id": 67, + "code": "MOD", + "desc": "Warrant" + }, + "68": { + "id": 68, + "code": "W40", + "desc": "DISCOUNT 40" + }, + "69": { + "id": 69, + "code": "VET", + "desc": "Veterans Railcard" + }, + "70": { + "id": 70, + "code": "PD5", + "desc": "PROMO DISCOUNT 50" + }, + "71": { + "id": 71, + "code": "W55", + "desc": "DISCOUNT 55" + }, + "72": { + "id": 72, + "code": "LCT", + "desc": "Lothian Concessionary" + }, + "73": { + "id": 73, + "code": "IRD", + "desc": "INTERRAIL CARD (70)" + }, + "74": { + "id": 74, + "code": "W60", + "desc": "DISCOUNT 60" + }, + "75": { + "id": 75, + "code": "LUS", + "desc": "18+ Oyster Photocard" + }, + "76": { + "id": 76, + "code": "LUR", + "desc": "16+ Oyster Photocard" + }, + "77": { + "id": 77, + "code": "GSU", + "desc": "LNER Small Group (stations)" + }, + "78": { + "id": 78, + "code": "HCT", + "desc": "Highland Concession" + }, + "79": { + "id": 79, + "code": "HCT", + "desc": "Highland Concession" + }, + "80": { + "id": 80, + "code": "GSU", + "desc": "LNER Small Group (stations)" + }, + "81": { + "id": 81, + "code": "L50", + "desc": "NE Lincs Concession 50" + }, + "82": { + "id": 82, + "code": "PD4", + "desc": "Promo Discount 40" + }, + "83": { + "id": 83, + "code": "S50", + "desc": "LNER Super Off-Pk Sgl Web Disc" + }, + "84": { + "id": 84, + "code": "FCT", + "desc": "FIFE CONCESSIONARY" + }, + "85": { + "id": 85, + "code": "FCT", + "desc": "FIFE CONCESSIONARY" + }, + "86": { + "id": 86, + "code": "S50", + "desc": "LNER Super Off-Pk Sgl Web Disc" + }, + "87": { + "id": 87, + "code": null, + "desc": "STRAH" + }, + "88": { + "id": 88, + "code": null, + "desc": "STRAH" + }, + "89": { + "id": 89, + "code": "W65", + "desc": "Discount 65" + }, + "90": { + "id": 90, + "code": "DBL", + "desc": "DERBYSHIRE B-LINE" + }, + "91": { + "id": 91, + "code": "DWF", + "desc": "DERBYSHIRE WAYFARER" + }, + "92": { + "id": 92, + "code": "W70", + "desc": "Discount 70" + }, + "93": { + "id": 93, + "code": null, + "desc": "GSDC" + }, + "94": { + "id": 94, + "code": "NCC", + "desc": "Nottingham Concessionary Travel" + }, + "95": { + "id": 95, + "code": null, + "desc": "NA" + }, + "96": { + "id": 96, + "code": "KSJ", + "desc": "KENT SCHOLAR JUNIOR" + }, + "97": { + "id": 97, + "code": null, + "desc": "CHLRC" + }, + "98": { + "id": 98, + "code": null, + "desc": "CRAVN" + }, + "99": { + "id": 99, + "code": "ASD", + "desc": "Manchester Airport Staff Discount" + }, + "100": { + "id": 100, + "code": "YNR", + "desc": "16-18 TPE Discount" + }, + "101": { + "id": 101, + "code": "W45", + "desc": "Discount 45" + }, + "102": { + "id": 102, + "code": null, + "desc": "EASIT" + }, + "103": { + "id": 103, + "code": null, + "desc": "NA" + }, + "104": { + "id": 104, + "code": null, + "desc": "SHPLY" + }, + "105": { + "id": 105, + "code": "IWR", + "desc": "Island Line Residents Card" + }, + "106": { + "id": 106, + "code": null, + "desc": "CON25" + }, + "107": { + "id": 107, + "code": "W47", + "desc": "Discount 47" + }, + "108": { + "id": 108, + "code": "IWC", + "desc": "ISLANDER CARD" + }, + "109": { + "id": 109, + "code": "IWC", + "desc": "ISLANDER CARD" + }, + "110": { + "id": 110, + "code": "MGP", + "desc": "Merseyrail GroupSave" + }, + "111": { + "id": 111, + "code": "WEB", + "desc": "11% WEB DISC" + }, + "112": { + "id": 112, + "code": "DRD", + "desc": "Dales Railcard" + }, + "113": { + "id": 113, + "code": "MGP", + "desc": "Merseyrail GroupSave" + }, + "114": { + "id": 114, + "code": null, + "desc": "VAL S" + }, + "115": { + "id": 115, + "code": "SWD", + "desc": "SWR Easit Discount" + }, + "116": { + "id": 116, + "code": "W52", + "desc": "Discount 52" + }, + "117": { + "id": 117, + "code": "SRY", + "desc": "Young Scot National Entitlement Card" + }, + "118": { + "id": 118, + "code": "D23", + "desc": "Corporate G" + }, + "119": { + "id": 119, + "code": "JSD", + "desc": "Jobseekers TPE Discount" + }, + "120": { + "id": 120, + "code": null, + "desc": "CORPJ" + }, + "121": { + "id": 121, + "code": "D47", + "desc": "Corporate H" + }, + "122": { + "id": 122, + "code": "SGB", + "desc": "Group Discount TPE" + }, + "123": { + "id": 123, + "code": "DCG", + "desc": "Devon & Cornwall Gold Card" + }, + "124": { + "id": 124, + "code": "DCG", + "desc": "Devon & Cornwall Gold Card" + }, + "125": { + "id": 125, + "code": "NUS", + "desc": "TOTUM NUS Extra" + }, + "126": { + "id": 126, + "code": "GEP", + "desc": "Gatwick Express Partners Card" + }, + "127": { + "id": 127, + "code": "PD5", + "desc": "PROMO DISCOUNT 50" + }, + "128": { + "id": 128, + "code": "RCK", + "desc": "Unicard Kernow" + }, + "129": { + "id": 129, + "code": "STL", + "desc": "Season Loyalty Discount" + }, + "130": { + "id": 130, + "code": "BA4", + "desc": "EMR Discount D" + }, + "131": { + "id": 131, + "code": "DGW", + "desc": "GREAT WESTERN 15" + }, + "132": { + "id": 132, + "code": "BB1", + "desc": "Key Workers Discount" + }, + "133": { + "id": 133, + "code": null, + "desc": "CON30" + }, + "134": { + "id": 134, + "code": "SGU", + "desc": "Small Group Discount" + }, + "135": { + "id": 135, + "code": "BB2", + "desc": "Student Discount" + }, + "136": { + "id": 136, + "code": "BB3", + "desc": "Caledonian Sleeper Discount" + }, + "137": { + "id": 137, + "code": "SGU", + "desc": "Small Group Discount" + }, + "138": { + "id": 138, + "code": "D08", + "desc": "CORPORATE F" + }, + "139": { + "id": 139, + "code": "SNA", + "desc": "Southern Adventure" + }, + "140": { + "id": 140, + "code": "SNA", + "desc": "Southern Adventure" + }, + "141": { + "id": 141, + "code": "D34", + "desc": "Concession 34%" + }, + "142": { + "id": 142, + "code": "BA5", + "desc": "EMR Discount E" + }, + "143": { + "id": 143, + "code": "DGU", + "desc": "GREAT WESTERN 5" + }, + "144": { + "id": 144, + "code": "D05", + "desc": "CORPORATE E" + }, + "145": { + "id": 145, + "code": "E07", + "desc": "CHILTERN CORPORATE A" + }, + "146": { + "id": 146, + "code": "DGV", + "desc": "GREAT WESTERN 10" + }, + "147": { + "id": 147, + "code": "D50", + "desc": "Concession 50%" + }, + "148": { + "id": 148, + "code": "BU1", + "desc": "BRISTOL UNI 10%" + }, + "149": { + "id": 149, + "code": "BU2", + "desc": "BRISTOL UNI 20%" + }, + "150": { + "id": 150, + "code": "FCC", + "desc": "FCC SEASON PASS" + }, + "151": { + "id": 151, + "code": "STL", + "desc": "Season Loyalty Discount" + }, + "152": { + "id": 152, + "code": "DGX", + "desc": "GREAT WESTERN 20" + }, + "153": { + "id": 153, + "code": "D13", + "desc": "Corporate Discount S" + }, + "154": { + "id": 154, + "code": "D75", + "desc": "Concession 75%" + }, + "155": { + "id": 155, + "code": "DGY", + "desc": "GREAT WESTERN 50" + }, + "156": { + "id": 156, + "code": "D11", + "desc": "Web Discount Adult" + }, + "157": { + "id": 157, + "code": "D55", + "desc": "Web Discount Child" + }, + "158": { + "id": 158, + "code": "DGZ", + "desc": "GREAT WESTERN 75" + }, + "159": { + "id": 159, + "code": "VPD", + "desc": "Virgin Trains 50% Promo" + }, + "160": { + "id": 160, + "code": "SSD", + "desc": "Styrathclyde Schools" + }, + "161": { + "id": 161, + "code": "FIP", + "desc": "FIP Discount 50%" + }, + "162": { + "id": 162, + "code": "SSD", + "desc": "Styrathclyde Schools" + }, + "163": { + "id": 163, + "code": null, + "desc": "NA" + }, + "164": { + "id": 164, + "code": "FIP", + "desc": "FIP Discount 50%" + }, + "165": { + "id": 165, + "code": "YHA", + "desc": "YHA Member Discount" + }, + "166": { + "id": 166, + "code": null, + "desc": "NA" + }, + "167": { + "id": 167, + "code": "FIR", + "desc": "FIP Discount 75%" + }, + "168": { + "id": 168, + "code": "MED", + "desc": "Medway Scholar Card" + }, + "169": { + "id": 169, + "code": "E10", + "desc": "CHILTERN CORPORATE B" + }, + "170": { + "id": 170, + "code": "FIR", + "desc": "FIP Discount 75%" + }, + "171": { + "id": 171, + "code": null, + "desc": "NA" + }, + "172": { + "id": 172, + "code": "GU3", + "desc": "Small Group 3" + }, + "173": { + "id": 173, + "code": null, + "desc": "NA" + }, + "174": { + "id": 174, + "code": "E12", + "desc": "CHILTERN CORPORATE C" + }, + "175": { + "id": 175, + "code": "KSC", + "desc": "KENT SCHOLARS CHILD" + }, + "176": { + "id": 176, + "code": "TPE", + "desc": "TPE 10" + }, + "177": { + "id": 177, + "code": "STF", + "desc": "Swindon Town FC Discount" + }, + "178": { + "id": 178, + "code": "STF", + "desc": "Swindon Town FC Discount" + }, + "179": { + "id": 179, + "code": "SYD", + "desc": "SY Concession Disabled" + }, + "180": { + "id": 180, + "code": "GWR", + "desc": "GWR 5% Corporate Discount" + }, + "181": { + "id": 181, + "code": "KAN", + "desc": "Nottingham Robin Hood 50%" + }, + "182": { + "id": 182, + "code": "SYS", + "desc": "SY Concession Senior" + }, + "183": { + "id": 183, + "code": "BUD", + "desc": "BUCKS CC DISCOUNT" + }, + "184": { + "id": 184, + "code": "ROV", + "desc": "Glasgow Conference Discount" + }, + "185": { + "id": 185, + "code": "WYD", + "desc": "West Yorks Disabled Discount" + }, + "186": { + "id": 186, + "code": "GU4", + "desc": "Small Group 4" + }, + "187": { + "id": 187, + "code": null, + "desc": "NA" + }, + "188": { + "id": 188, + "code": "WYS", + "desc": "West Yorks Senior Discount" + }, + "189": { + "id": 189, + "code": "C20", + "desc": "CHARITYLINE 20" + }, + "190": { + "id": 190, + "code": null, + "desc": "GUC" + }, + "191": { + "id": 191, + "code": null, + "desc": "NA" + }, + "192": { + "id": 192, + "code": "NSC", + "desc": "NSC Season Pass" + }, + "193": { + "id": 193, + "code": null, + "desc": "NA" + }, + "194": { + "id": 194, + "code": "BA2", + "desc": "EMR Discount B" + }, + "195": { + "id": 195, + "code": "BA3", + "desc": "EMR Discount A" + }, + "196": { + "id": 196, + "code": null, + "desc": "NA" + }, + "197": { + "id": 197, + "code": null, + "desc": "NA" + }, + "198": { + "id": 198, + "code": "GCC", + "desc": "Grand Central Community Card" + }, + "199": { + "id": 199, + "code": "SGB", + "desc": "Group Discount TPE" + }, + "200": { + "id": 200, + "code": "NEX", + "desc": "Nexus Employee" + }, + "201": { + "id": 201, + "code": "NEX", + "desc": "Nexus Employee" + }, + "202": { + "id": 202, + "code": "TP5", + "desc": "TPE 15" + }, + "203": { + "id": 203, + "code": "G5S", + "desc": "Club 50 Railcard Greater Anglia" + }, + "204": { + "id": 204, + "code": "G5O", + "desc": "Club 50 Web - Greater Anglia" + }, + "206": { + "id": 206, + "code": "HAP", + "desc": "Heathrow A Partner" + }, + "207": { + "id": 207, + "code": "C15", + "desc": "LNER Corporate 15" + }, + "208": { + "id": 208, + "code": "C30", + "desc": "LNER Corporate 30" + }, + "209": { + "id": 209, + "code": "C40", + "desc": "LNER Corporate 40" + }, + "210": { + "id": 210, + "code": "C45", + "desc": "LNER Corporate 45" + }, + "211": { + "id": 211, + "code": null, + "desc": "ABT" + }, + "212": { + "id": 212, + "code": "ISI", + "desc": "ISIC Discount (HEX)" + }, + "213": { + "id": 213, + "code": "P20", + "desc": "LNER Corporate 20" + }, + "214": { + "id": 214, + "code": "C25", + "desc": "LNER Corporate 25" + }, + "215": { + "id": 215, + "code": "C35", + "desc": "LNER Corporate 35" + }, + "216": { + "id": 216, + "code": "P50", + "desc": "LNER Corporate 50" + }, + "217": { + "id": 217, + "code": "C55", + "desc": "LNER Corporate 55" + }, + "218": { + "id": 218, + "code": "C60", + "desc": "LNER Corporate 60" + }, + "219": { + "id": 219, + "code": "C65", + "desc": "LNER Corporate 65" + }, + "220": { + "id": 220, + "code": "C70", + "desc": "LNER Corporate 70" + }, + "221": { + "id": 221, + "code": "C75", + "desc": "LNER Corporate 75" + }, + "222": { + "id": 222, + "code": "GPX", + "desc": "CrossCountry Group" + }, + "223": { + "id": 223, + "code": "GPX", + "desc": "CrossCountry Group" + }, + "224": { + "id": 224, + "code": null, + "desc": "CUG1" + }, + "225": { + "id": 225, + "code": "W61", + "desc": "DISCOUNT 61" + }, + "226": { + "id": 226, + "code": "B34", + "desc": "UNIDAYS 34" + }, + "227": { + "id": 227, + "code": "CUR", + "desc": "MyCumbria Card" + }, + "228": { + "id": 228, + "code": null, + "desc": "CMBRC" + }, + "229": { + "id": 229, + "code": "BUW", + "desc": "BUSINESS 10% (WMT)" + }, + "230": { + "id": 230, + "code": "BUY", + "desc": "TOURISTS 20% (WMT)" + }, + "231": { + "id": 231, + "code": "BUO", + "desc": "WMT ONLINE 10% DISC" + }, + "232": { + "id": 232, + "code": "W18", + "desc": "TfW 18 Saver Railcard" + }, + "233": { + "id": 233, + "code": "WSH", + "desc": "TfW Annual Season Railcard" + }, + "234": { + "id": 234, + "code": "CFC", + "desc": "Free Child Travel" + }, + "237": { + "id": 237, + "code": "C76", + "desc": "LNER CORP 76" + }, + "238": { + "id": 238, + "code": "C81", + "desc": "LNER CORP 81" + }, + "239": { + "id": 239, + "code": "C86", + "desc": "LNER CORP 86" + }, + "240": { + "id": 240, + "code": null, + "desc": "SASD" + }, + "248": { + "id": 248, + "code": "NGA", + "desc": "Group Discount Nth" + }, + "249": { + "id": 249, + "code": "NGA", + "desc": "Group Discount Nth" + }, + "250": { + "id": 250, + "code": null, + "desc": "CRM75" + }, + "251": { + "id": 251, + "code": null, + "desc": "zero" + }, + "252": { + "id": 252, + "code": "HUF", + "desc": "HALF PRICE PROMOTION" + }, + "253": { + "id": 253, + "code": "HUF", + "desc": "HALF PRICE PROMOTION" + }, + "254": { + "id": 254, + "code": null, + "desc": "CHD10" + }, + "255": { + "id": 255, + "code": "WTT", + "desc": "Winter Tours" + }, + "256": { + "id": 256, + "code": "WTT", + "desc": "Winter Tours" + }, + "257": { + "id": 257, + "code": "VSH", + "desc": "VS Holiday Scheme" + }, + "258": { + "id": 258, + "code": "VSH", + "desc": "VS Holiday Scheme" + }, + "259": { + "id": 259, + "code": "N25", + "desc": "Northern Promo 25%" + }, + "260": { + "id": 260, + "code": "N25", + "desc": "Northern Promo 25%" + }, + "261": { + "id": 261, + "code": "N40", + "desc": "Northern Promo 40%" + }, + "262": { + "id": 262, + "code": "N40", + "desc": "Northern Promo 40%" + }, + "263": { + "id": 263, + "code": "N60", + "desc": "Northern Promo 60%" + }, + "264": { + "id": 264, + "code": "N60", + "desc": "Northern Promo 60%" + }, + "265": { + "id": 265, + "code": "Q20", + "desc": "GC CORP 20" + }, + "266": { + "id": 266, + "code": "Q10", + "desc": "GC CORP 10" + }, + "267": { + "id": 267, + "code": "JJB", + "desc": "TPE GROUP TRAVEL" + }, + "268": { + "id": 268, + "code": "JJB", + "desc": "TPE GROUP TRAVEL" + }, + "269": { + "id": 269, + "code": "BB5", + "desc": "Avanti discount" + }, + "270": { + "id": 270, + "code": "PRD", + "desc": "Retired Staff Travel Card" + }, + "271": { + "id": 271, + "code": null, + "desc": "TPESU" + }, + "272": { + "id": 272, + "code": "DRW", + "desc": "Dales Railcard Winter CDR" + }, + "273": { + "id": 273, + "code": "DRW", + "desc": "Dales Railcard Winter CDR" + }, + "274": { + "id": 274, + "code": null, + "desc": "DALES" + }, + "275": { + "id": 275, + "code": "N50", + "desc": "Northern Promo 50%" + }, + "276": { + "id": 276, + "code": "N50", + "desc": "Northern Promo 50%" + } +} diff --git a/rsp6-webshite/index.html b/rsp6-webshite/index.html index 1e33b6e..4abe32f 100644 --- a/rsp6-webshite/index.html +++ b/rsp6-webshite/index.html @@ -13,7 +13,7 @@
@@ -145,8 +145,9 @@
- Powered by rsp6-decoder (Rust), - zxing-js, and + rsp6-decoder version ???. + Thanks to + zxing-js and wasm-bindgen. Site design using the GOV.UK Design System, under the terms of the MIT License. If you liked this, you might also enjoy intertube. diff --git a/rsp6-webshite/index.js b/rsp6-webshite/index.js index fd71848..e03da0d 100644 --- a/rsp6-webshite/index.js +++ b/rsp6-webshite/index.js @@ -1,16 +1,13 @@ -// To do before release: -// - fix double scan bug -// - reservations!! -// - minification - console.log("[+] Wow, JavaScript!"); import * as wasm from "rsp6-decoder"; import { BrowserAztecCodeReader } from '@zxing/library'; let stations = require("./stations.json"); let fares = require("./fares.json"); +let discounts = require("./discounts.json"); window.stations = stations; window.fares = fares; +window.discounts = discounts; let loaded = false; function onload() { @@ -36,6 +33,7 @@ function onload() { let file_upload = document.getElementById("file-upload-1"); const codeReader = new BrowserAztecCodeReader(); console.log("[+] Looks like everything initialised fine!"); + document.getElementById('code-version').innerHTML = __COMMIT_HASH__; let selectedDeviceId; @@ -116,10 +114,42 @@ function onload() { type = "Return (inbound)"; } else { - type = "Season"; + type = "Season"; } + if (data.bidirectional) { + type += " (bidirectional)"; + } + let discount = null; + let discount_name = null; + if (data.discount_code) { + if (discounts[data.discount_code]) { + discount = discounts[data.discount_code].desc; + if (discounts[data.discount_code].code) { + discount_name = discounts[data.discount_code].code; + } + } + else { + discount = "Unknown discount (" + data.discount_code + ")"; + } + } + let adult = data.child_ticket ? "Child" : "Adult"; + let first = data.first_class ? "First Class" : "Standard Class"; document.getElementById("ticket-fromto").innerHTML = origin + " to " + destination; - row("Fare", fare); + if (data.manually_inspect) { + row("", "Manual inspection required"); + } + let brfares_link = "https://www.brfares.com/!faredetail?orig=" + data.origin_nlc + "&dest=" + data.destination_nlc + "&tkt=" + data.fare; + if (data.route_code && data.route_code != 0) { + brfares_link += "&rte=" + data.route_code; + } + if (discount_name) { + brfares_link += "&rlc=" + discount_name; + } + row("Fare", fare + "
View on brfares.com"); + row("Class", adult + " " + first); + if (discount) { + row("Discount", discount); + } row("Ticket type", type); row("Start date", data.start_date); if (data.depart_time_flag || data.depart_time != "00:00:00.0") { @@ -144,6 +174,9 @@ function onload() { } row("Valid for", dov + " day" + maybe_s); } + if (data.limited_duration) { + row("Limited duration", data.limited_duration); + } row("Fare code", data.fare); if (data.purchase_details) { let price = data.purchase_details.price_pence; @@ -153,6 +186,25 @@ function onload() { row("Purchase reference", data.purchase_details.purchase_reference); } } + if (data.reservations.length > 0) { + let out = ""; + data.reservations.forEach((resv) => { + if (out != "") { + out += "
"; + } + out += "Train " + resv.retail_service_id + "
"; + if (resv.coach == "*") { + out += "No specific seat"; + } + else { + if (!resv.coach || resv.coach == " ") { + resv.coach = "?"; + } + out += "Coach " + resv.coach + " Seat " + resv.seat_number + (resv.seat_letter ? resv.seat_letter : ""); + } + }); + row("Reservations", out); + } let retailer = stations[data.retailer_id] ? stations[data.retailer_id].desc : "???"; row("Sold by", retailer + " (" + data.retailer_id + ")"); if (data.route_code != 0) { @@ -162,7 +214,7 @@ function onload() { row("Restriction", data.restriction_code); } if (data.discount_code != 0) { - row("Discount code", data.route_code); + row("Discount code", (discount_name ? discount_name + " / " : "") + data.discount_code); } if (data.passenger_id) { row("Passenger ID", data.passenger_id); @@ -191,15 +243,21 @@ function onload() { error("Scanner failed", "Couldn't figure out what cameras you have on your device.
" + err + "
"); }); + let epoch = 0; + document.getElementById('scan-button').addEventListener('click', () => { + let current_epoch = epoch + 1; + epoch = current_epoch; decode_banner.style.display = "none"; ticket_content.style.display = "none"; codeReader.decodeFromInputVideoDevice(undefined, 'video').then((result) => { error_banner.style.display = "none"; handleTicket(result); }).catch((err) => { - error("Scanner failed", "Looks like the barcode scanner failed in some way. If this keeps happening, try reloading the page or using one of the alternative options.
" + err + "
"); - console.error(err); + if (epoch == current_epoch) { + error("Scanner failed", "Looks like the barcode scanner failed in some way. If this keeps happening, try reloading the page or using one of the alternative options.
" + err + "
"); + console.error(err); + } }); video_div.style.display = "block"; console.log(`[+] Barcode scanner started on device ${selectedDeviceId}`); diff --git a/rsp6-webshite/webpack.config.js b/rsp6-webshite/webpack.config.js index 4ba1eb8..67596c3 100644 --- a/rsp6-webshite/webpack.config.js +++ b/rsp6-webshite/webpack.config.js @@ -1,5 +1,10 @@ const CopyWebpackPlugin = require("copy-webpack-plugin"); +let commitHash = require('child_process') + .execSync('git rev-parse --short HEAD') + .toString() + .trim(); const path = require('path'); +const webpack = require('webpack'); module.exports = { entry: "./bootstrap.js", @@ -9,6 +14,9 @@ module.exports = { }, mode: "development", plugins: [ - new CopyWebpackPlugin(['index.html', 'govuk.css']) + new CopyWebpackPlugin(['index.html', 'govuk.css']), + new webpack.DefinePlugin({ + __COMMIT_HASH__: JSON.stringify(commitHash) + }) ], };