diff --git a/lib/customers.js b/lib/customers.js
index 51478d11..8912b0e7 100644
--- a/lib/customers.js
+++ b/lib/customers.js
@@ -377,6 +377,37 @@ function batch () {
}, customers)))
}
+/**
+ * Query all customers, ordered by last activity
+ * and with aggregate columns based on their
+ * transactions
+ *
+ * @returns {array} Array of customers with it's
+ */
+function getCustomersList () {
+ const sql = `select name, phone, total_txs, total_spent,
+ created as last_active, fiat as last_tx_fiat, fiat_code as last_tx_fiat_code,
+ tx_class as last_tx_class
+ from (
+ select c.name, c.phone, t.tx_class, t.fiat, t.fiat_code, t.created,
+ row_number() over (partition by c.id order by t.created desc) as rn,
+ count(0) over (partition by c.id) as total_txs,
+ sum(t.fiat) over (partition by c.id) as total_spent
+ from customers c inner join (
+ select 'cashIn' as tx_class, id, fiat, fiat_code, created, customer_id
+ from cash_in_txs where send_confirmed = true union
+ select 'cashOut' as tx_class, id, fiat, fiat_code, created, customer_id
+ from cash_out_txs where confirmed_at is not null) t on c.id = t.customer_id
+ where c.id != $1
+ ) as cl where rn = 1
+ limit $2`
+ return db.any(sql, [ anonymous.uuid, NUM_RESULTS ])
+ .then(customers => Promise.all(_.map(customer => {
+ return populateOverrideUsernames(customer)
+ .then(camelize)
+ }, customers)))
+}
+
/**
* @param {String} id customer id
* @param {Object} patch customer update record
@@ -482,4 +513,4 @@ function updateFrontCamera (id, patch) {
})
}
-module.exports = { add, get, batch, getById, update, updatePhotoCard, updateFrontCamera }
+module.exports = { add, get, batch, getCustomersList, getById, update, updatePhotoCard, updateFrontCamera }
diff --git a/lib/new-admin/graphql/schema.js b/lib/new-admin/graphql/schema.js
index 75f673eb..7595f61c 100644
--- a/lib/new-admin/graphql/schema.js
+++ b/lib/new-admin/graphql/schema.js
@@ -4,6 +4,7 @@ const { GraphQLJSON, GraphQLJSONObject } = require('graphql-type-json')
const got = require('got')
const machineLoader = require('../../machine-loader')
+const customers = require('../../customers')
const { machineAction } = require('../machines')
const logs = require('../../logs')
const supportLogs = require('../../support_logs')
@@ -58,6 +59,17 @@ const typeDefs = gql`
statuses: [MachineStatus]
}
+ type Customer {
+ name: String!
+ phone: String
+ totalTxs: Int
+ totalSpent: String
+ lastActive: Date
+ lastTxFiat: String
+ lastTxFiatCode: String
+ lastTxClass: String
+ }
+
type Account {
code: String!
display: String!
@@ -146,6 +158,7 @@ const typeDefs = gql`
accounts: [Account]
cryptoCurrencies: [CryptoCurrency]
machines: [Machine]
+ customers: [Customer]
machineLogs(deviceId: ID!): [MachineLog]
funding: [CoinFunds]
serverVersion: String!
@@ -190,6 +203,7 @@ const resolvers = {
accounts: () => accounts,
cryptoCurrencies: () => coins,
machines: () => machineLoader.getMachineNames(),
+ customers: () => customers.getCustomersList(),
funding: () => funding.getFunding(),
machineLogs: (...[, { deviceId }]) => logs.simpleGetMachineLogs(deviceId),
serverVersion: () => serverVersion,
diff --git a/new-lamassu-admin/src/components/dataTable/DataTable.js b/new-lamassu-admin/src/components/dataTable/DataTable.js
new file mode 100644
index 00000000..2e744d8b
--- /dev/null
+++ b/new-lamassu-admin/src/components/dataTable/DataTable.js
@@ -0,0 +1,86 @@
+import React, { memo } from 'react'
+import {
+ AutoSizer,
+ List,
+ CellMeasurer,
+ CellMeasurerCache
+} from 'react-virtualized'
+
+import { THead, Th, Tr, Td } from 'src/components/fake-table/Table'
+import { mainWidth } from 'src/styling/variables'
+
+const DataTable = memo(({ elements, data }) => {
+ const cache = new CellMeasurerCache({
+ defaultHeight: 62,
+ fixedWidth: true
+ })
+
+ return (
+ <>
+
+
+ {elements.map(({ size, className, textAlign, header }, idx) => (
+ |
+ {header}
+ |
+ ))}
+
+
+
+
+ {({ height }) => (
+ (
+
+
+
+ {elements.map(
+ (
+ {
+ header,
+ size,
+ className,
+ textAlign,
+ view = it => it?.toString()
+ },
+ idx
+ ) => (
+ |
+ {view(data[index])}
+ |
+ )
+ )}
+
+
+
+ )}
+ overscanRowCount={50}
+ deferredMeasurementCache={cache}
+ />
+ )}
+
+
+
+
Customers
+
+
+
+
+ Cash-out
+
+
+
+ Cash-in
+
+
+