From 84445d4bace694f48b7e9b0dd387eab55025e3bd Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Tue, 29 Aug 2023 02:41:40 +0200 Subject: [PATCH] fix(server): date format of filtering transactions by date range --- packages/server/src/models/AccountTransaction.ts | 13 +++---------- .../server/src/models/InventoryCostLotTracker.ts | 2 +- packages/server/src/models/InventoryTransaction.ts | 2 +- packages/server/src/models/SaleInvoice.ts | 2 +- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/packages/server/src/models/AccountTransaction.ts b/packages/server/src/models/AccountTransaction.ts index 0c7a1ac56..a8ad848f7 100644 --- a/packages/server/src/models/AccountTransaction.ts +++ b/packages/server/src/models/AccountTransaction.ts @@ -59,15 +59,9 @@ export default class AccountTransaction extends TenantModel { } }, filterDateRange(query, startDate, endDate, type = 'day') { - const dateFormat = 'YYYY-MM-DD HH:mm:ss'; - const fromDate = moment(startDate) - .utcOffset(0) - .startOf(type) - .format(dateFormat); - const toDate = moment(endDate) - .utcOffset(0) - .endOf(type) - .format(dateFormat); + const dateFormat = 'YYYY-MM-DD'; + const fromDate = moment(startDate).startOf(type).format(dateFormat); + const toDate = moment(endDate).endOf(type).format(dateFormat); if (startDate) { query.where('date', '>=', fromDate); @@ -111,7 +105,6 @@ export default class AccountTransaction extends TenantModel { query.modify('filterDateRange', null, toDate); query.modify('sumationCreditDebit'); }, - contactsOpeningBalance( query, openingDate, diff --git a/packages/server/src/models/InventoryCostLotTracker.ts b/packages/server/src/models/InventoryCostLotTracker.ts index fd9b13475..7b644f9a5 100644 --- a/packages/server/src/models/InventoryCostLotTracker.ts +++ b/packages/server/src/models/InventoryCostLotTracker.ts @@ -33,7 +33,7 @@ export default class InventoryCostLotTracker extends TenantModel { query.groupBy('item_id'); }, filterDateRange(query, startDate, endDate, type = 'day') { - const dateFormat = 'YYYY-MM-DD HH:mm:ss'; + const dateFormat = 'YYYY-MM-DD'; const fromDate = moment(startDate).startOf(type).format(dateFormat); const toDate = moment(endDate).endOf(type).format(dateFormat); diff --git a/packages/server/src/models/InventoryTransaction.ts b/packages/server/src/models/InventoryTransaction.ts index 372cd7ca4..ffdf2471d 100644 --- a/packages/server/src/models/InventoryTransaction.ts +++ b/packages/server/src/models/InventoryTransaction.ts @@ -36,7 +36,7 @@ export default class InventoryTransaction extends TenantModel { static get modifiers() { return { filterDateRange(query, startDate, endDate, type = 'day') { - const dateFormat = 'YYYY-MM-DD HH:mm:ss'; + const dateFormat = 'YYYY-MM-DD'; const fromDate = moment(startDate).startOf(type).format(dateFormat); const toDate = moment(endDate).endOf(type).format(dateFormat); diff --git a/packages/server/src/models/SaleInvoice.ts b/packages/server/src/models/SaleInvoice.ts index 38f21f285..261110184 100644 --- a/packages/server/src/models/SaleInvoice.ts +++ b/packages/server/src/models/SaleInvoice.ts @@ -176,7 +176,7 @@ export default class SaleInvoice extends mixin(TenantModel, [ * Filters the invoices between the given date range. */ filterDateRange(query, startDate, endDate, type = 'day') { - const dateFormat = 'YYYY-MM-DD HH:mm:ss'; + const dateFormat = 'YYYY-MM-DD'; const fromDate = moment(startDate).startOf(type).format(dateFormat); const toDate = moment(endDate).endOf(type).format(dateFormat);