diff --git a/lib/new-admin/bills.js b/lib/new-admin/bills.js index 25a8661d..27f7861c 100644 --- a/lib/new-admin/bills.js +++ b/lib/new-admin/bills.js @@ -2,7 +2,13 @@ const db = require('../db') // Get all bills with device id const getBills = () => { - return db.any(`SELECT d.device_id, b.fiat, b.created, d.cashbox FROM cash_in_txs INNER JOIN bills AS b ON b.cash_in_txs_id = cash_in_txs.id INNER JOIN devices as d ON d.device_id = cash_in_txs.device_id ORDER BY device_id, created DESC`) + return db.any(` + SELECT d.device_id, b.fiat, b.created, d.cashbox + FROM cash_in_txs + INNER JOIN bills AS b ON b.cash_in_txs_id = cash_in_txs.id + INNER JOIN devices as d ON d.device_id = cash_in_txs.device_id + ORDER BY device_id, created DESC` + ) .then(res => { return res.map(item => ({ fiat: item.fiat,