@@ -171,7 +171,7 @@ const CustomerProfile = memo(() => {
/>
-
-
+
- Customers
-
-
-
-
-
-
-
-
-
-
-
+
+
{elements.map(({ size, header }, idx) => (
-
{elements.map(({ size, value }, idx) => (
-
-
+
)
})
diff --git a/new-lamassu-admin/src/pages/Customers/components/Field.js b/new-lamassu-admin/src/pages/Customers/components/Field.js
index 42762e12..a1b904a1 100644
--- a/new-lamassu-admin/src/pages/Customers/components/Field.js
+++ b/new-lamassu-admin/src/pages/Customers/components/Field.js
@@ -1,19 +1,35 @@
import { makeStyles } from '@material-ui/core/styles'
+import classnames from 'classnames'
import React, { memo } from 'react'
import { Info3, Label1 } from 'src/components/typography'
+import { comet } from 'src/styling/variables'
-import mainStyles from '../CustomersList.styles'
+const useStyles = makeStyles({
+ field: {
+ width: 144,
+ height: 46
+ },
+ label: {
+ color: comet,
+ margin: [[0, 3]]
+ },
+ value: {
+ whiteSpace: 'nowrap',
+ overflow: 'hidden',
+ textOverflow: 'ellipsis',
+ margin: 0,
+ paddingLeft: 4
+ }
+})
-const useStyles = makeStyles(mainStyles)
-
-const Field = memo(({ label, display }) => {
+const Field = memo(({ label, display, className }) => {
const classes = useStyles()
return (
- Rafael{R.path(['name'])(customer)}
-
+
+ + {R.path(['name'])(customer) ?? R.path(['phone'])(customer)} +
+
+
{header}
-
+
))}
+
+
))}
{value} -
- {label}
- {display}
+ {
updateCustomer({ idCardDataOverride: OVERRIDE_AUTHORIZED })
}
reject={() => updateCustomer({ idCardDataOverride: OVERRIDE_REJECTED })}>
-
+ {label}
+ {display}
)
})
diff --git a/new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.js b/new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.js
index 9ace389a..dfae0408 100644
--- a/new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.js
+++ b/new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.js
@@ -1,5 +1,5 @@
-import { makeStyles } from '@material-ui/core/styles'
-import moment from 'moment'
+import { makeStyles, Box } from '@material-ui/core'
+// import moment from 'moment'
import * as R from 'ramda'
import React, { memo } from 'react'
@@ -11,11 +11,21 @@ import {
import { ReactComponent as CrossedCameraIcon } from 'src/styling/icons/ID/photo/crossed-camera.svg'
import { URI } from 'src/utils/apollo'
-import mainStyles from '../CustomersList.styles'
+// import Field from './Field'
-import Field from './Field'
-
-const useStyles = makeStyles(mainStyles)
+const useStyles = makeStyles({
+ idCardPhotoCard: {
+ width: 325,
+ height: 240,
+ margin: [[32, 0, 0, 0]]
+ },
+ idCardPhoto: {
+ maxHeight: 130
+ },
+ field: {
+ marginLeft: 14
+ }
+})
const IdCardPhotoCard = memo(({ customerData, updateCustomer }) => {
const classes = useStyles()
@@ -29,7 +39,7 @@ const IdCardPhotoCard = memo(({ customerData, updateCustomer }) => {
updateCustomer({ idCardPhotoOverride: OVERRIDE_AUTHORIZED })
}
reject={() => updateCustomer({ idCardPhotoOverride: OVERRIDE_REJECTED })}>
-
+
{customerData.idCardPhotoPath ? (
![]()
{
) : (
+ /> */}
+
)
})
diff --git a/new-lamassu-admin/src/pages/Customers/components/IdDataCard.js b/new-lamassu-admin/src/pages/Customers/components/IdDataCard.js
index 09db7b76..2a517ef6 100644
--- a/new-lamassu-admin/src/pages/Customers/components/IdDataCard.js
+++ b/new-lamassu-admin/src/pages/Customers/components/IdDataCard.js
@@ -1,4 +1,4 @@
-import { makeStyles } from '@material-ui/core/styles'
+import { makeStyles, Box } from '@material-ui/core'
import moment from 'moment'
import * as R from 'ramda'
import React, { memo } from 'react'
@@ -8,16 +8,44 @@ import {
OVERRIDE_AUTHORIZED,
OVERRIDE_REJECTED
} from 'src/pages/Customers/components/propertyCard'
-
-import mainStyles from '../CustomersList.styles'
+import { ifNotNull } from 'src/utils/nullCheck'
import Field from './Field'
-const useStyles = makeStyles(mainStyles)
+const useStyles = makeStyles({
+ idDataCard: {
+ width: 550,
+ height: 240
+ },
+ column: {
+ marginBottom: 7
+ }
+})
const IdDataCard = memo(({ customerData, updateCustomer }) => {
const classes = useStyles()
+ const idData = R.path(['idCardData'])(customerData)
+
+ const name = R.path(['firstName'])(idData) ?? ''
+ const lastName = R.path(['lastName'])(idData) ?? ''
+
+ const gender = R.path(['gender'])(idData)
+ const idNumber = R.path(['documentNumber'])(idData)
+ const country = R.path(['country'])(idData)
+
+ const rawExpirationDate = R.path(['expirationDate'])(idData)
+ const expirationDate = ifNotNull(
+ rawExpirationDate,
+ moment.utc(rawExpirationDate).format('YYYY-MM-D')
+ )
+
+ const rawDob = R.path(['dateOfBirth'])(idData)
+ const age = ifNotNull(
+ rawDob,
+ moment.utc().diff(moment.utc(rawDob).format('YYYY-MM-D'), 'years')
+ )
+
return (
-
- authorize()}>
- Authorize
-
- )
+ // const AuthorizeButton = () => (
+ // authorize()}>
+ // Authorize
+ //
+ // )
- const RejectButton = () => (
- reject()}>
- Reject
-
- )
+ // const RejectButton = () => (
+ // reject()}>
+ // Reject
+ //
+ // )
- const authorizedAsString =
- state === OVERRIDE_PENDING
- ? 'Pending'
- : state === OVERRIDE_REJECTED
- ? 'Rejected'
- : 'Accepted'
+ // const authorizedAsString =
+ // state === OVERRIDE_PENDING
+ // ? 'Pending'
+ // : state === OVERRIDE_REJECTED
+ // ? 'Rejected'
+ // : 'Accepted'
return (
{children}
-
)
}
diff --git a/new-lamassu-admin/src/pages/Customers/components/propertyCard/PropertyCard.styles.js b/new-lamassu-admin/src/pages/Customers/components/propertyCard/PropertyCard.styles.js
index e46c12e2..3fb5ff0c 100644
--- a/new-lamassu-admin/src/pages/Customers/components/propertyCard/PropertyCard.styles.js
+++ b/new-lamassu-admin/src/pages/Customers/components/propertyCard/PropertyCard.styles.js
@@ -48,9 +48,10 @@ const propertyCardStyles = {
marginLeft: 12
},
cardProperties: {
+ display: 'flex',
borderRadius: 8,
width: '100%',
- height: 'calc(100% - 100px)',
+ height: 'calc(100% - 75px)',
padding: [[20]],
boxSizing: 'border-box',
boxShadow: '0 0 8px 0 rgba(0, 0, 0, 0.04)',
diff --git a/new-lamassu-admin/src/styling/icons/button/authorize/white.svg b/new-lamassu-admin/src/styling/icons/button/authorize/white.svg
index fe9d27bb..54a67625 100644
--- a/new-lamassu-admin/src/styling/icons/button/authorize/white.svg
+++ b/new-lamassu-admin/src/styling/icons/button/authorize/white.svg
@@ -1,9 +1,9 @@
-
-
-
-
-
-
+
+
+
+
+
)
diff --git a/new-lamassu-admin/src/pages/Customers/components/PhoneCard.js b/new-lamassu-admin/src/pages/Customers/components/PhoneCard.js
index 7d1b1c2c..c5b15a46 100644
--- a/new-lamassu-admin/src/pages/Customers/components/PhoneCard.js
+++ b/new-lamassu-admin/src/pages/Customers/components/PhoneCard.js
@@ -9,11 +9,14 @@ import {
OVERRIDE_REJECTED
} from 'src/pages/Customers/components/propertyCard'
-import mainStyles from '../CustomersList.styles'
-
import Field from './Field'
-const useStyles = makeStyles(mainStyles)
+const useStyles = makeStyles({
+ phoneCard: {
+ width: 300,
+ height: 240
+ }
+})
const PhoneCard = memo(({ customerData, updateCustomer }) => {
const classes = useStyles()
diff --git a/new-lamassu-admin/src/pages/Customers/components/TransactionsList.js b/new-lamassu-admin/src/pages/Customers/components/TransactionsList.js
index cfc237ee..7f87c62a 100644
--- a/new-lamassu-admin/src/pages/Customers/components/TransactionsList.js
+++ b/new-lamassu-admin/src/pages/Customers/components/TransactionsList.js
@@ -1,6 +1,7 @@
import { makeStyles } from '@material-ui/core/styles'
import BigNumber from 'bignumber.js'
import moment from 'moment'
+import * as R from 'ramda'
import React from 'react'
import DataTable from 'src/components/tables/DataTable'
@@ -16,6 +17,7 @@ const useStyles = makeStyles(mainStyles)
const TransactionsList = ({ data }) => {
const classes = useStyles()
+ const hasData = !(R.isEmpty(data) || R.isNil(data))
const elements = [
{
@@ -77,10 +79,14 @@ const TransactionsList = ({ data }) => {
<>
-
All transactions from this customer
++ {hasData + ? 'All transactions from this customer' + : 'No transactions so far'} +
{title}
-
+ {/*
*/}
{authorizedAsString}
-
+
+ {/* V2 */}
+ {/*
*/}
{state !== OVERRIDE_AUTHORIZED && AuthorizeButton()}
{state !== OVERRIDE_REJECTED && RejectButton()}
-
+