From d30c3816749217abc4aefdfe2bd954656238e7c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20S=C3=A1?= Date: Thu, 18 Nov 2021 17:59:22 +0000 Subject: [PATCH] fix: sort cashbox batches by date --- lib/cashbox-batches.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/cashbox-batches.js b/lib/cashbox-batches.js index f459c078..d1bee08e 100644 --- a/lib/cashbox-batches.js +++ b/lib/cashbox-batches.js @@ -19,8 +19,13 @@ function createCashboxBatch (deviceId, cashboxCount) { } function getBatches () { - const sql = `SELECT cb.id, cb.device_id, cb.created, cb.operation_type, cb.bill_count_override, cb.performed_by, - json_agg(b.*) AS bills FROM cashbox_batches cb LEFT JOIN bills b ON cb.id=b.cashbox_batch_id GROUP BY cb.id` + const sql = ` + SELECT cb.id, cb.device_id, cb.created, cb.operation_type, cb.bill_count_override, cb.performed_by, json_agg(b.*) AS bills + FROM cashbox_batches AS cb + LEFT JOIN bills AS b ON cb.id = b.cashbox_batch_id + GROUP BY cb.id + ORDER BY cb.created DESC + ` return db.any(sql).then(res => _.map(it => _.mapKeys(ite => _.camelCase(ite), it), res)) }