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

refactor: rename cash box/cassette batch operations type

Browse source
This commit is contained in:
André Sá 2021-12-14 12:32:09 +00:00
parent f7c7d52a93
commit 3213513f54
3 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/cashbox-batches.js
View file

@ -5,8 +5,8 @@ const uuid = require('uuid')
function createCashboxBatch (deviceId, cashboxCount) { function createCashboxBatch (deviceId, cashboxCount) {
if (_.isEqual(0, cashboxCount)) throw new Error('Cashbox is empty. Cashbox batch could not be created.') if (_.isEqual(0, cashboxCount)) throw new Error('Cashbox is empty. Cashbox batch could not be created.')
const sql = `INSERT INTO cashbox_batches (id, device_id, created, operation_type) VALUES ($1, $2, now(), 'cash-in-empty') RETURNING *` const sql = `INSERT INTO cashbox_batches (id, device_id, created, operation_type) VALUES ($1, $2, now(), 'cash-box-empty') RETURNING *`
const sql2 = ` const sql2 = `
UPDATE bills SET cashbox_batch_id=$1 UPDATE bills SET cashbox_batch_id=$1
FROM cash_in_txs FROM cash_in_txs
WHERE bills.cash_in_txs_id = cash_in_txs.id AND WHERE bills.cash_in_txs_id = cash_in_txs.id AND
@ -29,7 +29,7 @@ function updateMachineWithBatch (machineContext, oldCashboxCount) {
return db.tx(t => { return db.tx(t => {
const deviceId = machineContext.deviceId const deviceId = machineContext.deviceId
const batchId = uuid.v4() const batchId = uuid.v4()
const q1 = t.none(`INSERT INTO cashbox_batches (id, device_id, created, operation_type) VALUES ($1, $2, now(), 'cash-in-empty')`, [batchId, deviceId]) const q1 = t.none(`INSERT INTO cashbox_batches (id, device_id, created, operation_type) VALUES ($1, $2, now(), 'cash-box-empty')`, [batchId, deviceId])
const q2 = t.none(`UPDATE bills SET cashbox_batch_id=$1 FROM cash_in_txs const q2 = t.none(`UPDATE bills SET cashbox_batch_id=$1 FROM cash_in_txs
WHERE bills.cash_in_txs_id = cash_in_txs.id AND WHERE bills.cash_in_txs_id = cash_in_txs.id AND
cash_in_txs.device_id = $2 AND cash_in_txs.device_id = $2 AND

18
migrations/1617967601902-add-batches-type.js
View file

@ -3,15 +3,15 @@ var db = require('./db')
exports.up = function (next) { exports.up = function (next) {
var sqls = [ var sqls = [
`CREATE TYPE cashbox_batch_type AS ENUM( `CREATE TYPE cashbox_batch_type AS ENUM(
'cash-in-empty', 'cash-box-empty',
'cash-out-1-refill', 'cash-cassette-1-refill',
'cash-out-1-empty', 'cash-cassette-1-empty',
'cash-out-2-refill', 'cash-cassette-2-refill',
'cash-out-2-empty', 'cash-cassette-2-empty',
'cash-out-3-refill', 'cash-cassette-3-refill',
'cash-out-3-empty', 'cash-cassette-3-empty',
'cash-out-4-refill', 'cash-cassette-4-refill',
'cash-out-4-empty' 'cash-cassette-4-empty'
)`, )`,
`ALTER TABLE cashbox_batches ADD COLUMN operation_type cashbox_batch_type NOT NULL`, `ALTER TABLE cashbox_batches ADD COLUMN operation_type cashbox_batch_type NOT NULL`,
`ALTER TABLE cashbox_batches ADD COLUMN bill_count_override SMALLINT`, `ALTER TABLE cashbox_batches ADD COLUMN bill_count_override SMALLINT`,

6
new-lamassu-admin/src/pages/Maintenance/CashboxHistory.js
View file

@ -93,14 +93,14 @@ const CashboxHistory = ({ machines, currency }) => {
(ret, i) => (ret, i) =>
R.pipe( R.pipe(
R.assoc( R.assoc(
`cash-out-${i}-refill`, `cash-cassette-${i}-refill`,
<> <>
<TxOutIcon /> <TxOutIcon />
<span className={classes.operationType}>Cash-out {i} refill</span> <span className={classes.operationType}>Cash-out {i} refill</span>
</> </>
), ),
R.assoc( R.assoc(
`cash-out-${i}-empty`, `cash-cassette-${i}-empty`,
<> <>
<TxOutIcon /> <TxOutIcon />
<span className={classes.operationType}>Cash-out {i} emptied</span> <span className={classes.operationType}>Cash-out {i} emptied</span>
@ -108,7 +108,7 @@ const CashboxHistory = ({ machines, currency }) => {
) )
)(ret), )(ret),
{ {
'cash-in-empty': ( 'cash-box-empty': (
<> <>
<TxInIcon /> <TxInIcon />
<span className={classes.operationType}>Cash-in emptied</span> <span className={classes.operationType}>Cash-in emptied</span>