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

fix: transaction screens fixes

Browse source
This commit is contained in:
Taranto 2020-06-01 20:54:19 +01:00
parent bf8f1d991c
commit 8f7bb412a1
12 changed files with 315 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/new-admin/transactions.js
View file

@ -62,7 +62,10 @@ function batch () {
}
function getCustomerTransactions (customerId) {
const packager = _.flow(_.flatten, _.orderBy(_.property('created'), ['desc']),
const packager = _.flow(it => {
console.log()
return it
}, _.flatten, _.orderBy(_.property('created'), ['desc']),
_.take(NUM_RESULTS), _.map(camelize), addNames)
const cashInSql = `select 'cashIn' as tx_class, txs.*,

1
lib/plugins.js
View file

@ -185,6 +185,7 @@ function plugins (settings, deviceId) {
const commissions = configManager.getCommissions(cryptoCode, deviceId, settings.config)
const minimumTx = BN(commissions.minimumTx)
const cashInFee = BN(commissions.fixedFee)
logger.info('FEE', cashInFee)
const cashInCommission = BN(commissions.cashIn)
const cashOutCommission = _.isNumber(commissions.cashOut) ? BN(commissions.cashOut) : null
const cryptoRec = coinUtils.getCryptoCurrency(cryptoCode)