diff --git a/new-lamassu-admin/src/pages/Customers/CustomerProfile.js b/new-lamassu-admin/src/pages/Customers/CustomerProfile.js index dece97bf..31c972b7 100644 --- a/new-lamassu-admin/src/pages/Customers/CustomerProfile.js +++ b/new-lamassu-admin/src/pages/Customers/CustomerProfile.js @@ -385,7 +385,7 @@ const CustomerProfile = memo(() => { const timezone = R.path(['config', 'locale_timezone'], configResponse) - const classes = useStyles({ blocked }) + const classes = useStyles() return ( <> @@ -419,29 +419,26 @@ const CustomerProfile = memo(() => { /> Actions -
+
setWizard(true)}> {`Manual data entry`} -
-
{}}> {`Add individual discount`} -
-
{isSuspended && ( { )} { ({ + actionButton: { + margin: [[0, 0, 4, 0]], display: 'flex', flexDirection: 'row', - margin: [[0, 0, 4, 0]], - padding: [[0, props.blocked ? 35 : 48, 0]] - }), - customerDiscount: { - display: 'flex', - flexDirection: 'row', - margin: [[0, 0, 4, 0]], - padding: [[0, 23.5, 0]] + justifyContent: 'center' }, - customerManualDataEntry: { + actionBar: { display: 'flex', - flexDirection: 'row', - margin: [[8, 0, 4, 0]], - padding: [[0, 40.5, 0]] - }, - retrieveInformation: { - display: 'flex', - flexDirection: 'row', - margin: [[0, 0, 4, 0]], - padding: [[0, 32.5, 0]] + flexDirection: 'column', + width: 219 }, panels: { display: 'flex' diff --git a/new-lamassu-admin/src/pages/Customers/components/TransactionsList.js b/new-lamassu-admin/src/pages/Customers/components/TransactionsList.js index 8b55208c..ea8d765e 100644 --- a/new-lamassu-admin/src/pages/Customers/components/TransactionsList.js +++ b/new-lamassu-admin/src/pages/Customers/components/TransactionsList.js @@ -70,12 +70,7 @@ const TransactionsList = ({ customer, data, loading, locale }) => { const tableElements = [ { - header: 'Machine', - width: 160, - view: R.path(['machineName']) - }, - { - width: 125, + width: 40, view: it => ( <> {it.txClass === 'cashOut' ? ( @@ -86,6 +81,11 @@ const TransactionsList = ({ customer, data, loading, locale }) => { ) }, + { + header: 'Machine', + width: 160, + view: R.path(['machineName']) + }, { header: 'Transaction ID', width: 145,