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

WIP

Browse source
This commit is contained in:
Josh Harvey 2016-11-20 17:49:36 +02:00
parent becd62a1fb
commit 938eb9ac97
9 changed files with 153 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/postgresql_interface.js
View file

@ -29,7 +29,6 @@ function getInsertQuery (tableName, fields) {
// logs inputted bill and overall tx status (if available)
exports.recordBill = function recordBill (deviceId, rec) {
console.log('DEBUG10: %j', rec)
const fields = [
'id',
'device_id',
@ -54,8 +53,6 @@ exports.recordBill = function recordBill (deviceId, rec) {
rec.fiat
]
console.log('DEBUG11: %j', values)
return db.none(getInsertQuery('bills', fields), values)
.catch(err => {
if (isUniqueViolation(err)) return logger.warn('Attempt to report bill twice')
@ -127,24 +124,19 @@ exports.addInitialIncoming = function addInitialIncoming (deviceId, tx) {
function insertDispense (deviceId, tx, cartridges) {
const fields = [
'device_id', 'cash_out_txs_id',
'dispense1', 'reject1', 'count1',
'dispense2', 'reject2', 'count2',
'refill', 'error'
'dispense1', 'reject1',
'dispense2', 'reject2', 'error'
]
const sql = getInsertQuery('dispenses', fields)
console.log('DEBUG24: %j', tx)
const dispense1 = tx.bills[0].actualDispense
const dispense2 = tx.bills[1].actualDispense
const reject1 = tx.bills[0].rejected
const reject2 = tx.bills[1].rejected
const count1 = cartridges[0].count
const count2 = cartridges[1].count
const values = [
deviceId, tx.id,
dispense1, reject1, count1, dispense2, reject2, count2,
dispense1, reject1, dispense2, reject2,
false, tx.error
]