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

feat(all) keep track of dispensed bills

Browse source
This commit is contained in:
Josh Harvey 2014-11-16 22:56:10 -05:00
parent c9f2976ea2
commit d6c9244d7a
3 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/plugins.js
View file

@ -438,7 +438,7 @@ exports.cashOut = function cashOut(deviceFingerprint, tx, cb) {
}); });
}; };
exports.depositAck = function depositAck(deviceFingerprint, tx) { exports.dispenseAck = function dispenseAck(deviceFingerprint, tx) {
_setDispenseStatus(deviceFingerprint, tx, 'dispensedDeposit'); _setDispenseStatus(deviceFingerprint, tx, 'dispensedDeposit');
}; };

18
lib/postgresql_interface.js
View file

@ -75,7 +75,7 @@ exports.recordBill = function recordBill(deviceFingerprint, rec, cb) {
fields.push('uuid'); fields.push('uuid');
} }
client.query(getInsertQuery('bills', fields), values, function(err, billInfo) { client.query(getInsertQuery('bills', fields), values, function(err) {
if (err && PG_ERRORS[err.code] === 'uniqueViolation') if (err && PG_ERRORS[err.code] === 'uniqueViolation')
return cb(null, {code: 204}); return cb(null, {code: 204});
@ -244,3 +244,19 @@ exports.changeTxStatus = function changeTxStatus(txId, newStatus, data, cb) {
} }
client.query(query, values, cb); client.query(query, values, cb);
}; };
exports.decrementCartridges =
function decrementCartridges(fingerprint, cartridge1, cartridge2, cb) {
var query = 'UPDATE devices SET cartridge_1_bills = cartridge_1_bills - $1, ' +
'cartridge_2_bills = cartridge_2_bills - $2 ' +
'WHERE fingerprint = $3';
client.query(query, [cartridge1, cartridge2, fingerprint], cb);
};
exports.fillCartridges =
function fillCartridges(fingerprint, cartridge1, cartridge2, cb) {
var query = 'UPDATE devices SET cartridge_1_bills = $1, ' +
'cartridge_2_bills = $2 ' +
'WHERE fingerprint = $3';
client.query(query, [cartridge1, cartridge2, fingerprint], cb);
};

6
lib/routes.js
View file

@ -114,8 +114,8 @@ function cashOut(req, res) {
}); });
} }
function depositAck(req, res) { function dispenseAck(req, res) {
plugins.depositAck(getFingerprint(req), req.body); plugins.dispenseAck(getFingerprint(req), req.body);
res.json(200); res.json(200);
} }
@ -180,7 +180,7 @@ function init(localConfig) {
app.post('/send', authMiddleware, send); app.post('/send', authMiddleware, send);
app.post('/cash_out', authMiddleware, cashOut); app.post('/cash_out', authMiddleware, cashOut);
app.post('/deposit_ack', authMiddleware, depositAck); app.post('/dispense_ack', authMiddleware, dispenseAck);
app.post('/event', authMiddleware, deviceEvent); app.post('/event', authMiddleware, deviceEvent);
app.post('/verify_user', authMiddleware, verifyUser); app.post('/verify_user', authMiddleware, verifyUser);