fix: pre release screen fixes

This commit is contained in:
Taranto 2020-06-16 09:43:58 +01:00 committed by Josh Harvey
parent 1bcc87757b
commit 5dd8501a17
98 changed files with 1569 additions and 1149 deletions

View file

@ -1,6 +1,7 @@
const _ = require('lodash/fp')
const axios = require('axios')
const logger = require('./logger')
const db = require('./db')
const pairing = require('./pairing')
const configManager = require('./new-config-manager')
@ -15,8 +16,10 @@ function getMachines () {
cashbox: r.cashbox,
cassette1: r.cassette1,
cassette2: r.cassette2,
pairedAt: new Date(r.created).valueOf(),
lastPing: new Date(r.last_online).valueOf(),
version: r.version,
model: r.model,
pairedAt: new Date(r.created),
lastPing: new Date(r.last_online),
name: r.name,
// TODO: we shall start using this JSON field at some point
// location: r.location,
@ -36,19 +39,12 @@ function getMachineNames (config) {
const addName = r => {
const cashOutConfig = configManager.getCashOut(r.deviceId, config)
const cashOut = cashOutConfig.active
const cashOut = !!cashOutConfig.active
// TODO new-admin: these two fields were not ever working
const machineModel = ''
const machineLocation = ''
// TODO: obtain next fields from somewhere
const printer = null
const pingTime = null
// TODO new-admin actually load status based on ping.
const statuses = [{label: 'Unknown detailed status', type: 'warning'}]
const softwareVersion = ''
return _.assign(r, {cashOut, machineModel, machineLocation, printer, pingTime, statuses, softwareVersion})
return _.assign(r, {cashOut, statuses})
}
return _.map(addName, machines)