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

get cartridge counts from db

Browse source
This commit is contained in:
Josh Harvey 2014-11-28 10:53:38 -05:00
parent 238d4bd879
commit 209272eb26
4 changed files with 63 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/routes.js
View file

@ -1,6 +1,5 @@
'use strict';
var fs = require('fs');
var logger = require('./logger');
var mock = false;
@ -18,13 +17,6 @@ module.exports = {
var STALE_TICKER = 180000;
var STALE_BALANCE = 180000;
var cartridges = null;
try {
cartridges = JSON.parse(fs.readFileSync('./cartridges.json'));
} catch (ex) {
logger.warn('No cartridges.json file found: ' + ex.message);
}
function poll(req, res) {
var rateRec = plugins.getDeviceRate();
var balanceRec = plugins.getBalance();
@ -59,9 +51,9 @@ function poll(req, res) {
var fiatCommission = config.exchanges.settings.fiatCommission ||
config.exchanges.settings.commission;
console.log('DEBUG0');
plugins.dispenseStatus(session(req), function(err, dispenseStatus) {
plugins.pollQueries(session(req), function(err, results) {
if (err) return logger.error(err);
var cartridges = results.cartridges;
var response = {
err: null,
rate: rate * config.exchanges.settings.commission,
@ -69,7 +61,7 @@ function poll(req, res) {
fiat: fiatBalance,
locale: config.brain.locale,
txLimit: parseInt(complianceSettings.maximum.limit, 10),
dispenseStatus: dispenseStatus,
dispenseStatus: results.dispenseStatus,
idVerificationEnabled: complianceSettings.idVerificationEnabled,
cartridges: cartridges,
twoWayMode: cartridges ? true : false