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

fix: exclude unbatched bills of unpaired machines

Browse source
This commit is contained in:
siiky 2025-06-23 16:32:08 +01:00
parent 1331aad0ac
commit 2f7724bd12
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
packages/server/lib/new-admin/services/bills.js
View file

@ -3,8 +3,6 @@ const pgp = require('pg-promise')()
const db = require('../../db') const db = require('../../db')
const WHERE = conds => (conds ? 'WHERE ' + conds : '')
const AND = (...clauses) => clauses.filter(clause => !!clause).join(' AND ') const AND = (...clauses) => clauses.filter(clause => !!clause).join(' AND ')
const getBatchIDCondition = filter => { const getBatchIDCondition = filter => {
@ -31,14 +29,25 @@ const getBills = filters => {
LEFT OUTER JOIN ( LEFT OUTER JOIN (
SELECT id, device_id SELECT id, device_id
FROM cash_in_txs FROM cash_in_txs
WHERE ${AND(deviceIDCondition)} WHERE ${AND(
deviceIDCondition,
'device_id NOT IN (SELECT device_id FROM unpaired_devices)',
)}
) AS cit ) AS cit
ON cit.id = b.cash_in_txs_id ON cit.id = b.cash_in_txs_id
WHERE ${AND(batchIDCondition, "b.destination_unit = 'cashbox'")}` WHERE ${AND(
batchIDCondition,
"b.destination_unit = 'cashbox'",
'cit.device_id IS NOT NULL',
)}`
const sql2 = `SELECT b.id, b.fiat, b.fiat_code, b.created, b.cashbox_batch_id, b.device_id const sql2 = `SELECT b.id, b.fiat, b.fiat_code, b.created, b.cashbox_batch_id, b.device_id
FROM empty_unit_bills b FROM empty_unit_bills b
${WHERE(AND(deviceIDCondition, batchIDCondition))}` WHERE ${AND(
deviceIDCondition,
batchIDCondition,
'b.device_id NOT IN (SELECT device_id FROM unpaired_devices)',
)}`
return Promise.all([db.any(sql), db.any(sql2)]).then( return Promise.all([db.any(sql), db.any(sql2)]).then(
([bills, operationalBills]) => ([bills, operationalBills]) =>