From e83e74f9d1312240f1e2b11a866480f718ed12f9 Mon Sep 17 00:00:00 2001 From: siiky Date: Mon, 23 Jun 2025 13:18:57 +0100 Subject: [PATCH] chore: format SQL queries --- .../server/lib/new-admin/services/bills.js | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/packages/server/lib/new-admin/services/bills.js b/packages/server/lib/new-admin/services/bills.js index 78092ab8..67babaf3 100644 --- a/packages/server/lib/new-admin/services/bills.js +++ b/packages/server/lib/new-admin/services/bills.js @@ -20,11 +20,22 @@ const getBills = filters => { } } - const sql = `SELECT b.id, b.fiat, b.fiat_code, b.created, b.cashbox_batch_id, cit.device_id AS device_id FROM bills b LEFT OUTER JOIN ( - SELECT id, device_id FROM cash_in_txs ${deviceStatement} - ) AS cit ON cit.id = b.cash_in_txs_id ${batchStatement(filters.batch)} ${_.isNil(batchStatement(filters.batch)) ? `WHERE` : `AND`} b.destination_unit = 'cashbox'` + const sql = `SELECT b.id, b.fiat, b.fiat_code, b.created, b.cashbox_batch_id, cit.device_id AS device_id + FROM bills b + LEFT OUTER JOIN ( + SELECT id, device_id + FROM cash_in_txs + ${deviceStatement} + ) AS cit + ON cit.id = b.cash_in_txs_id + ${batchStatement(filters.batch)} + ${_.isNil(batchStatement(filters.batch)) ? `WHERE` : `AND`} + b.destination_unit = 'cashbox'` - const sql2 = `SELECT b.id, b.fiat, b.fiat_code, b.created, b.cashbox_batch_id, b.device_id FROM empty_unit_bills b ${deviceStatement} ${!_.isNil(filters.deviceId) && !_.isNil(filters.batch) ? `AND ${_.replace('WHERE', '', batchStatement(filters.batch))}` : `${batchStatement(filters.batch)}`}` + const sql2 = `SELECT b.id, b.fiat, b.fiat_code, b.created, b.cashbox_batch_id, b.device_id + FROM empty_unit_bills b + ${deviceStatement} + ${!_.isNil(filters.deviceId) && !_.isNil(filters.batch) ? `AND ${_.replace('WHERE', '', batchStatement(filters.batch))}` : `${batchStatement(filters.batch)}`}` return Promise.all([db.any(sql), db.any(sql2)]).then( ([bills, operationalBills]) =>