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

Merge pull request #941 from ubavic/fix/download_transactions_log_pt2

Browse source 
fix: add missing modules
This commit is contained in:
Rafael Taranto 2021-11-23 09:46:48 +00:00 • committed by GitHub
commit d456d2cc2e
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/new-admin/services/transactions.js
View file

@ -2,6 +2,8 @@ const _ = require('lodash/fp')
const pgp = require('pg-promise')()
const db = require('../../db')
const BN = require('../../bn')
const { utils: coinUtils } = require('lamassu-coins')
const machineLoader = require('../../machine-loader')
const tx = require('../../tx')
const cashInTx = require('../../cash-in/cash-in-tx')
@ -128,9 +130,9 @@ function simplifiedBatch (data) {
const getCryptoAmount = it => coinUtils.toUnit(BN(it.cryptoAtoms), it.cryptoCode).toString()
const getProfit = it => {
const getCommissionFee = it => BN(it.commissionPercentage).mul(BN(it.fiat))
const getCommissionFee = it => BN(it.commissionPercentage).times(BN(it.fiat))
if (!it.cashInFee) return getCommissionFee(it)
return getCommissionFee(it).add(BN(it.cashInFee))
return getCommissionFee(it).plus(BN(it.cashInFee))
}
const getCashOutStatus = it => {