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

Merge pull request #1056 from ubavic/cashbox_history_table_height

Browse source 
fix: cash box history table height
This commit is contained in:
Rafael Taranto 2022-01-20 10:47:28 +00:00 • committed by GitHub
commit 30db7d8a9c
2 changed files with 19 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

40
new-lamassu-admin/src/pages/Maintenance/CashCassettes.js
View file

@ -338,28 +338,26 @@ const CashCassettes = () => {
</Box>
)}
</TitleSection>
<div className={classes.tableContainer}>
{!showHistory && (
<>
<EditableTable
error={error?.message}
name="cashboxes"
stripeWhen={isCashOutDisabled}
elements={elements}
data={machines}
validationSchema={ValidationSchema}
tbodyWrapperClass={classes.tBody}
/>
{!showHistory && (
<>
<EditableTable
error={error?.message}
name="cashboxes"
stripeWhen={isCashOutDisabled}
elements={elements}
data={machines}
validationSchema={ValidationSchema}
tbodyWrapperClass={classes.tBody}
/>
{data && R.isEmpty(machines) && (
<EmptyTable message="No machines so far" />
)}
</>
)}
{showHistory && (
<CashboxHistory machines={machines} currency={fiatCurrency} />
)}
</div>
{data && R.isEmpty(machines) && (
<EmptyTable message="No machines so far" />
)}
</>
)}
{showHistory && (
<CashboxHistory machines={machines} currency={fiatCurrency} />
)}
<CashCassettesFooter
currencyCode={fiatCurrency}
machines={machines}

4
new-lamassu-admin/src/pages/Maintenance/CashCassettes.styles.js
View file

@ -4,10 +4,6 @@ export default {
cashbox: {
height: 36
},
tableContainer: {
flex: 1,
marginBottom: 100
},
tBody: {
maxHeight: '65vh',
overflow: 'auto'