lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1010 from ubavic/fix/direction_arrow_on_customer_page

Browse source 
fix: customer details page
This commit is contained in:
Rafael Taranto 2021-12-20 15:01:57 +00:00 • committed by GitHub
commit c5f308e7a4
3 changed files with 19 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

17
new-lamassu-admin/src/pages/Customers/CustomerProfile.js
View file

@ -385,7 +385,7 @@ const CustomerProfile = memo(() => {
const timezone = R.path(['config', 'locale_timezone'], configResponse) const timezone = R.path(['config', 'locale_timezone'], configResponse)
const classes = useStyles({ blocked }) const classes = useStyles()
return ( return (
<> <>
@ -419,29 +419,26 @@ const CustomerProfile = memo(() => {
/> />
</div> </div>
<Label1 className={classes.actionLabel}>Actions</Label1> <Label1 className={classes.actionLabel}>Actions</Label1>
<div> <div className={classes.actionBar}>
<ActionButton <ActionButton
className={classes.customerManualDataEntry} className={classes.actionButton}
color="primary" color="primary"
Icon={DataIcon} Icon={DataIcon}
InverseIcon={DataReversedIcon} InverseIcon={DataReversedIcon}
onClick={() => setWizard(true)}> onClick={() => setWizard(true)}>
{`Manual data entry`} {`Manual data entry`}
</ActionButton> </ActionButton>
</div>
<div>
<ActionButton <ActionButton
className={classes.customerDiscount} className={classes.actionButton}
color="primary" color="primary"
Icon={Discount} Icon={Discount}
InverseIcon={DiscountReversedIcon} InverseIcon={DiscountReversedIcon}
onClick={() => {}}> onClick={() => {}}>
{`Add individual discount`} {`Add individual discount`}
</ActionButton> </ActionButton>
</div>
<div>
{isSuspended && ( {isSuspended && (
<ActionButton <ActionButton
className={classes.actionButton}
color="primary" color="primary"
Icon={AuthorizeIcon} Icon={AuthorizeIcon}
InverseIcon={AuthorizeReversedIcon} InverseIcon={AuthorizeReversedIcon}
@ -455,7 +452,7 @@ const CustomerProfile = memo(() => {
)} )}
<ActionButton <ActionButton
color="primary" color="primary"
className={classes.customerBlock} className={classes.actionButton}
Icon={blocked ? AuthorizeIcon : BlockIcon} Icon={blocked ? AuthorizeIcon : BlockIcon}
InverseIcon={ InverseIcon={
blocked ? AuthorizeReversedIcon : BlockReversedIcon blocked ? AuthorizeReversedIcon : BlockReversedIcon
@ -471,7 +468,7 @@ const CustomerProfile = memo(() => {
</ActionButton> </ActionButton>
<ActionButton <ActionButton
color="primary" color="primary"
className={classes.retrieveInformation} className={classes.actionButton}
Icon={blocked ? AuthorizeIcon : BlockIcon} Icon={blocked ? AuthorizeIcon : BlockIcon}
InverseIcon={ InverseIcon={
blocked ? AuthorizeReversedIcon : BlockReversedIcon blocked ? AuthorizeReversedIcon : BlockReversedIcon

25
new-lamassu-admin/src/pages/Customers/CustomerProfile.styles.js
View file

@ -15,29 +15,16 @@ export default {
customerDetails: { customerDetails: {
marginBottom: 18 marginBottom: 18
}, },
customerBlock: props => ({ actionButton: {
margin: [[0, 0, 4, 0]],
display: 'flex', display: 'flex',
flexDirection: 'row', flexDirection: 'row',
margin: [[0, 0, 4, 0]], justifyContent: 'center'
padding: [[0, props.blocked ? 35 : 48, 0]]
}),
customerDiscount: {
display: 'flex',
flexDirection: 'row',
margin: [[0, 0, 4, 0]],
padding: [[0, 23.5, 0]]
}, },
customerManualDataEntry: { actionBar: {
display: 'flex', display: 'flex',
flexDirection: 'row', flexDirection: 'column',
margin: [[8, 0, 4, 0]], width: 219
padding: [[0, 40.5, 0]]
},
retrieveInformation: {
display: 'flex',
flexDirection: 'row',
margin: [[0, 0, 4, 0]],
padding: [[0, 32.5, 0]]
}, },
panels: { panels: {
display: 'flex' display: 'flex'

12
new-lamassu-admin/src/pages/Customers/components/TransactionsList.js
View file

@ -70,12 +70,7 @@ const TransactionsList = ({ customer, data, loading, locale }) => {
const tableElements = [ const tableElements = [
{ {
header: 'Machine', width: 40,
width: 160,
view: R.path(['machineName'])
},
{
width: 125,
view: it => ( view: it => (
<> <>
{it.txClass === 'cashOut' ? ( {it.txClass === 'cashOut' ? (
@ -86,6 +81,11 @@ const TransactionsList = ({ customer, data, loading, locale }) => {
</> </>
) )
}, },
{
header: 'Machine',
width: 160,
view: R.path(['machineName'])
},
{ {
header: 'Transaction ID', header: 'Transaction ID',
width: 145, width: 145,