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

fix: empty cashbox conditional

Browse source
This commit is contained in:
Sérgio Salgado 2021-12-09 23:06:24 +00:00
parent 616d2d2915
commit f16be1d263
2 changed files with 4 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/machine-loader.js
View file

@ -142,7 +142,7 @@ function emptyCashInBills (rec) {
function setCassetteBills (rec) { function setCassetteBills (rec) {
return db.oneOrNone(`SELECT cashbox FROM devices WHERE device_id=$1 LIMIT 1`, [rec.deviceId]) return db.oneOrNone(`SELECT cashbox FROM devices WHERE device_id=$1 LIMIT 1`, [rec.deviceId])
.then(oldCashboxValue => { .then(oldCashboxValue => {
if (_.isNil(oldCashboxValue) || rec.cashbox === oldCashboxValue) { if (_.isNil(oldCashboxValue) || rec.cashbox === oldCashboxValue.cashbox) {
const sql = 'UPDATE devices SET cashbox=$1, cassette1=$2, cassette2=$3, cassette3=$4, cassette4=$5 WHERE device_id=$6' const sql = 'UPDATE devices SET cashbox=$1, cassette1=$2, cassette2=$3, cassette3=$4, cassette4=$5 WHERE device_id=$6'
return db.none(sql, [rec.cashbox, rec.cassettes[0], rec.cassettes[1], rec.cassettes[2], rec.cassettes[3], rec.deviceId]) return db.none(sql, [rec.cashbox, rec.cassettes[0], rec.cassettes[1], rec.cassettes[2], rec.cassettes[3], rec.deviceId])
} }

30
new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.js
View file

@ -82,14 +82,6 @@ const SET_CASSETTE_BILLS = gql`
} }
` `
const CREATE_BATCH = gql`
mutation createBatch($deviceId: ID, $cashboxCount: Int) {
createBatch(deviceId: $deviceId, cashboxCount: $cashboxCount) {
id
}
}
`
const CashCassettes = ({ machine, config, refetchData }) => { const CashCassettes = ({ machine, config, refetchData }) => {
const data = { machine, config } const data = { machine, config }
const classes = useStyles() const classes = useStyles()
@ -176,31 +168,15 @@ const CashCassettes = ({ machine, config, refetchData }) => {
refetchQueries: () => refetchData() refetchQueries: () => refetchData()
}) })
const [createBatch] = useMutation(CREATE_BATCH) const onSave = (_, cashbox, cassettes) =>
setCassetteBills({
const onSave = (_, cashbox, cassette1, cassette2, cassette3, cassette4) => {
const oldCashboxCount = machine.cashbox
if (cashbox < oldCashboxCount) {
createBatch({
variables: {
deviceId: machine.deviceId,
cashboxCount: oldCashboxCount
}
})
}
return setCassetteBills({
variables: { variables: {
action: 'setCassetteBills', action: 'setCassetteBills',
deviceId: machine.deviceId, deviceId: machine.deviceId,
cashbox, cashbox,
cassette1, ...cassettes
cassette2,
cassette3,
cassette4
} }
}) })
}
return machine.name ? ( return machine.name ? (
<> <>