lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: re-add pollingRoutes.js/poll changes

Browse source
This commit is contained in:
csrapr 2021-03-17 18:12:58 +00:00 • committed by Josh Harvey
parent 757db75d1a
commit 8d6ed7c2a3
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/routes/pollingRoutes.js
View file

@ -38,8 +38,10 @@ function poll (req, res, next) {
const triggers = configManager.getTriggers(settings.config) const triggers = configManager.getTriggers(settings.config)
const operatorInfo = configManager.getOperatorInfo(settings.config) const operatorInfo = configManager.getOperatorInfo(settings.config)
const machineInfo = { deviceId: req.deviceId, deviceName: req.deviceName }
const cashOutConfig = configManager.getCashOut(deviceId, settings.config) const cashOutConfig = configManager.getCashOut(deviceId, settings.config)
const receipt = configManager.getReceipt(settings.config) const receipt = configManager.getReceipt(settings.config)
const terms = configManager.getTermsConditions(settings.config)
state.pids[deviceId] = { pid, ts: Date.now() } state.pids[deviceId] = { pid, ts: Date.now() }
@ -75,6 +77,7 @@ function poll (req, res, next) {
hasLightning, hasLightning,
receipt, receipt,
operatorInfo, operatorInfo,
machineInfo,
triggers triggers
} }
@ -97,7 +100,7 @@ function poll (req, res, next) {
// BACKWARDS_COMPATIBILITY 7.4.9 // BACKWARDS_COMPATIBILITY 7.4.9
// machines before 7.4.9 expect t&c on poll // machines before 7.4.9 expect t&c on poll
if (!machineVersion || semver.lt(machineVersion, '7.4.9')) { if (!machineVersion || semver.lt(machineVersion, '7.4.9')) {
response.terms = config.termsScreenActive && config.termsScreenText ? createTerms(config) : null response.terms = createTerms(terms)
} }
return res.json(_.assign(response, results)) return res.json(_.assign(response, results))