diff --git a/lib/customers.js b/lib/customers.js index 18a5f3ca..03852d32 100644 --- a/lib/customers.js +++ b/lib/customers.js @@ -488,7 +488,7 @@ function getCustomersList () { */ function getCustomerById (id) { const sql = `select id, authorized_override, days_suspended, front_camera_path, front_camera_override, - phone, name, sms_override, id_card_data, id_card_data_override, id_card_data_expiration, + phone, sms_override, id_card_data, id_card_data_override, id_card_data_expiration, id_card_photo_path, id_card_photo_override, us_ssn, us_ssn_override, sanctions, sanctions_at, sanctions_override, 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 @@ -496,7 +496,7 @@ function getCustomerById (id) { select c.id, c.authorized_override, greatest(0, date_part('day', c.suspended_until - now())) as days_suspended, c.front_camera_path, c.front_camera_override, - c.phone, c.name, c.sms_override, c.id_card_data, c.id_card_data_override, c.id_card_data_expiration, + c.phone, c.sms_override, c.id_card_data, c.id_card_data_override, c.id_card_data_expiration, c.id_card_photo_path, c.id_card_photo_override, c.us_ssn, c.us_ssn_override, c.sanctions, c.sanctions_at, c.sanctions_override, t.tx_class, t.fiat, t.fiat_code, t.created, row_number() over (partition by c.id order by t.created desc) as rn, diff --git a/lib/new-admin/graphql/schema.js b/lib/new-admin/graphql/schema.js index 99880eab..fd50b723 100644 --- a/lib/new-admin/graphql/schema.js +++ b/lib/new-admin/graphql/schema.js @@ -16,6 +16,7 @@ const machineEventsByIdBatch = require('../../postgresql_interface').machineEven const promoCodeManager = require('../../promo-codes') const notifierQueries = require('../../notifier/queries') const bills = require('../bills') +const anonymous = require('../../constants').anonymousCustomer const serverVersion = require('../../../package.json').version const transactions = require('../transactions') @@ -86,7 +87,7 @@ const typeDefs = gql` frontCameraPath: String frontCameraOverride: String phone: String - name: String + isAnonymous: Boolean smsOverride: String idCardData: JSONObject idCardDataOverride: String @@ -213,6 +214,7 @@ const typeDefs = gql` cashInFeeCrypto: String minimumTx: Float customerId: ID + isAnonymous: Boolean txVersion: Int! termsAccepted: Boolean commissionPercentage: String @@ -356,7 +358,11 @@ const resolvers = { JSONObject: GraphQLJSONObject, Date: GraphQLDateTime, Customer: { - transactions: parent => transactionsLoader.load(parent.id) + transactions: parent => transactionsLoader.load(parent.id), + isAnonymous: parent => (parent.id === anonymous.uuid) + }, + Transaction: { + isAnonymous: parent => (parent.customerId === anonymous.uuid) }, Machine: { latestEvent: parent => machineEventsLoader.load(parent.deviceId) diff --git a/new-lamassu-admin/src/pages/Customers/CustomerProfile.js b/new-lamassu-admin/src/pages/Customers/CustomerProfile.js index 4b3c2963..631e51cf 100644 --- a/new-lamassu-admin/src/pages/Customers/CustomerProfile.js +++ b/new-lamassu-admin/src/pages/Customers/CustomerProfile.js @@ -27,7 +27,6 @@ import { import { getFormattedPhone, getName } from './helper' const useStyles = makeStyles(styles) -const ANONYMOUS_USER_NAME = 'anonymous' const GET_CUSTOMER = gql` query customer($customerId: ID!) { @@ -38,7 +37,7 @@ const GET_CUSTOMER = gql` frontCameraPath frontCameraOverride phone - name + isAnonymous smsOverride idCardData idCardDataOverride @@ -167,7 +166,7 @@ const CustomerProfile = memo(() => { locale={locale} setShowCompliance={() => setShowCompliance(!showCompliance)} /> - {!loading && customerData.name !== ANONYMOUS_USER_NAME && ( + {!loading && !customerData.isAnonymous && (
Actions { if (tx.customerIdCardData) return formatCustomerName(tx.customerIdCardData) return tx.customerPhone } - const elements = [ { header: '', @@ -110,7 +109,7 @@ const Transactions = () => { view: it => (
{getCustomerDisplayName(it)}
- {getCustomerDisplayName(it) !== ANONYMOUS_USER_NAME && ( + {!it.isAnonymous && (
redirect(it.customerId)}>