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

chore: use meaningful names

Browse source
This commit is contained in:
siiky 2025-06-23 16:38:44 +01:00
parent 2f7724bd12
commit 317660e8d9
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,7 @@ const getBills = filters => {
: '' : ''
const batchIDCondition = getBatchIDCondition(filters.batch) const batchIDCondition = getBatchIDCondition(filters.batch)
const sql = `SELECT b.id, b.fiat, b.fiat_code, b.created, b.cashbox_batch_id, cit.device_id AS device_id const cashboxBills = `SELECT b.id, b.fiat, b.fiat_code, b.created, b.cashbox_batch_id, cit.device_id AS device_id
FROM bills b FROM bills b
LEFT OUTER JOIN ( LEFT OUTER JOIN (
SELECT id, device_id SELECT id, device_id
@ -41,7 +41,7 @@ const getBills = filters => {
'cit.device_id IS NOT NULL', '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 recyclerBills = `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( WHERE ${AND(
deviceIDCondition, deviceIDCondition,
@ -49,9 +49,9 @@ const getBills = filters => {
'b.device_id NOT IN (SELECT device_id FROM unpaired_devices)', '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(cashboxBills), db.any(recyclerBills)]).then(
([bills, operationalBills]) => ([cashboxBills, recyclerBills]) =>
_.map(_.mapKeys(_.camelCase), _.concat(bills, operationalBills)), _.map(_.mapKeys(_.camelCase), _.concat(cashboxBills, recyclerBills)),
) )
} }