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

handle cash-out errors

Browse source
This commit is contained in:
Josh Harvey 2018-01-23 17:57:20 +02:00
parent d23c419442
commit fc17d2cdf8
3 changed files with 92 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/cash-out-tx.js
View file

@ -98,7 +98,7 @@ function mapDispense (tx) {
function logDispense (tx) {
const baseRec = {error: tx.error, error_code: tx.errorCode}
const rec = _.merge(mapDispense(tx), baseRec)
const action = tx.dispenseConfirmed ? 'dispense' : 'dispenseError'
const action = _.isEmpty(tx.error) ? 'dispense' : 'dispenseError'
return logAction(action, rec, tx)
}
@ -176,7 +176,13 @@ function nextHd (isHd, tx) {
.then(row => _.set('hdIndex', row.hd_index, tx))
}
function dispenseOccurred (bills) {
return _.every(_.overEvery([_.has('dispensed'), _.has('rejected')]), bills)
}
function updateCassettes (tx) {
if (!dispenseOccurred(tx.bills)) return Promise.resolve()
const sql = `update devices set
cassette1 = cassette1 - $1,
cassette2 = cassette2 - $2
@ -235,7 +241,11 @@ function preProcess (oldTx, newTx, pi) {
return logAction(updatedTx.status, rec, updatedTx)
}
if (!oldTx.dispenseConfirmed && updatedTx.dispenseConfirmed) {
const hasError = !oldTx.error && newTx.error
const hasDispenseOccurred = !dispenseOccurred(oldTx.bills) && dispenseOccurred(newTx.bills)
if (hasError || hasDispenseOccurred) {
console.log('DEBUG100')
return logDispense(updatedTx)
.then(updateCassettes(updatedTx))
}