- Assume the cash box is emptied whenever it's removed, creating a new
- batch on the history screen and setting its current balance to zero.
-
-
-
- Cash boxes won't be assumed emptied when removed, nor their counts
- modified. Instead, to update the count and create a new batch,
- you'll click the 'Edit' button on this panel.
-
+ We can automatically assume you emptied a bill validator's cash
+ box when the machine detects that it has been removed.
+
+
+
+ Assume the cash box is emptied whenever it's removed, creating a
+ new batch on the history screen and setting its current balance to
+ zero.
+
+
+
+ Cash boxes won't be assumed emptied when removed, nor their counts
+ modified. Instead, to update the count and create a new batch,
+ you'll click the 'Edit' button on this panel.
+
+
+
+
+
+ )}
+
+ )
)
}
diff --git a/new-lamassu-admin/src/pages/Maintenance/CashCassettesFooter.js b/new-lamassu-admin/src/pages/Maintenance/CashCassettesFooter.js
index 04d1de99..4f619c2a 100644
--- a/new-lamassu-admin/src/pages/Maintenance/CashCassettesFooter.js
+++ b/new-lamassu-admin/src/pages/Maintenance/CashCassettesFooter.js
@@ -1,20 +1,17 @@
import { makeStyles } from '@material-ui/core'
-// import BigNumber from 'bignumber.js'
+import BigNumber from 'bignumber.js'
import * as R from 'ramda'
import React from 'react'
import { Info1, Info2, Info3 } from 'src/components/typography/index'
-// import { ReactComponent as TxInIcon } from 'src/styling/icons/direction/cash-in.svg'
+import { ReactComponent as TxInIcon } from 'src/styling/icons/direction/cash-in.svg'
import { ReactComponent as TxOutIcon } from 'src/styling/icons/direction/cash-out.svg'
import { fromNamespace } from 'src/utils/config'
+import { numberToFiatAmount } from 'src/utils/number.js'
import styles from './CashCassettesFooter.styles.js'
const useStyles = makeStyles(styles)
-/* const sortDate = function(a, b) {
- return new Date(b.created).getTime() - new Date(a.created).getTime()
-} */
-
const CashCassettesFooter = ({
machines,
config,
@@ -43,44 +40,34 @@ const CashCassettesFooter = ({
const totalInCassettes = R.sum(R.reduce(reducerFn, [0, 0, 0, 0], machines))
- /* const totalInCashBox = R.sum(
- R.flatten(
- R.map(id => {
- const sliceIdx = R.path([id, 0, 'cashbox'])(bills) ?? 0
- return R.map(
- R.prop('fiat'),
- R.slice(0, sliceIdx, R.sort(sortDate, bills[id] ?? []))
- )
- }, deviceIds)
- )
- ) */
+ const totalInCashBox = R.sum(R.map(it => it.fiat)(bills))
- // const total = new BigNumber(totalInCassettes + totalInCashBox).toFormat(0)
+ const total = new BigNumber(totalInCassettes + totalInCashBox).toFormat(0)
return (