Feat: footer calculate cashout total

This commit is contained in:
csrapr 2021-02-18 18:00:38 +00:00 committed by Josh Harvey
parent 26aaf0c366
commit bce45d34e0
5 changed files with 74 additions and 11 deletions

18
lib/new-admin/bills.js Normal file
View file

@ -0,0 +1,18 @@
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`)
.then(res => {
return res.map(item => ({
fiat: item.fiat,
deviceId: item.device_id,
cashbox: item.cashbox,
created: item.created
}))
})
}
module.exports = {
getBills
}

View file

@ -15,6 +15,7 @@ const blacklist = require('../../blacklist')
const machineEventsByIdBatch = require('../../postgresql_interface').machineEventsByIdBatch
const promoCodeManager = require('../../promo-codes')
const notifierQueries = require('../../notifier/queries')
const bills = require('../bills')
const serverVersion = require('../../../package.json').version
const transactions = require('../transactions')
@ -259,6 +260,13 @@ const typeDefs = gql`
valid: Boolean
}
type Bills {
fiat: Int
deviceId: ID
created: Date
cashbox: Int
}
type Query {
countries: [Country]
currencies: [Currency]
@ -294,6 +302,7 @@ const typeDefs = gql`
notifications: [Notification]
alerts: [Notification]
hasUnreadNotifications: Boolean
bills: [Bills]
}
type SupportLogsResponse {
@ -393,7 +402,8 @@ const resolvers = {
fiatRates: () => forex.getFiatRates(),
notifications: () => notifierQueries.getNotifications(),
hasUnreadNotifications: () => notifierQueries.hasUnreadNotifications(),
alerts: () => notifierQueries.getAlerts()
alerts: () => notifierQueries.getAlerts(),
bills: () => bills.getBills()
},
Mutation: {
machineAction: (...[, { deviceId, action, cashbox, cassette1, cassette2, newName }]) => machineAction({ deviceId, action, cashbox, cassette1, cassette2, newName }),