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

Merge branch 'dev' into fix/lam-266/profits-calculation

Browse source
This commit is contained in:
André Sá 2022-01-28 16:49:44 +00:00
commit 94089620ad
107 changed files with 1298 additions and 416 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -69,7 +69,7 @@ function batch (
AND ($12 is null or txs.to_address = $12)
AND ($13 is null or txs.txStatus = $13)
${excludeTestingCustomers ? `AND c.is_test_customer is false` : ``}
AND (fiat > 0)
AND (error IS NOT null OR fiat > 0)
ORDER BY created DESC limit $4 offset $5`
const cashOutSql = `SELECT 'cashOut' AS tx_class,