diff --git a/src/modules/configuration/couch/data/services/couch.service.ts b/src/modules/configuration/couch/data/services/couch.service.ts index 2efb2db..985c9f4 100644 --- a/src/modules/configuration/couch/data/services/couch.service.ts +++ b/src/modules/configuration/couch/data/services/couch.service.ts @@ -111,6 +111,7 @@ export class CouchService { const selector = { created_at: { $gte: todayTimestamp, + status: 'settled', }, }; diff --git a/src/modules/transaction/sales-price-formula/data/services/sales-price-formula-data.service.ts b/src/modules/transaction/sales-price-formula/data/services/sales-price-formula-data.service.ts index df1c8fc..a4f9c3f 100644 --- a/src/modules/transaction/sales-price-formula/data/services/sales-price-formula-data.service.ts +++ b/src/modules/transaction/sales-price-formula/data/services/sales-price-formula-data.service.ts @@ -13,7 +13,10 @@ import { SalesPriceFormulaModel, TransactionSettingModel, } from '../models/sales-price-formula.model'; -import { CONNECTION_NAME } from 'src/core/strings/constants/base.constants'; +import { + CONNECTION_NAME, + STATUS, +} from 'src/core/strings/constants/base.constants'; import { Repository } from 'typeorm'; import { FormulaType } from '../../constants'; import { TaxModel } from 'src/modules/transaction/tax/data/models/tax.model'; @@ -75,6 +78,7 @@ export class SalesPriceFormulaDataService extends BaseDataService :timestamp', { timestamp: todayTimestamp, }) + .andWhere('transaction.status = :status', { status: STATUS.SETTLED }) .andWhere('transaction.type = :type', { type: TransactionType.COUNTER }) .getRawOne() .then((result) => result.sum || 0), diff --git a/src/modules/transaction/transaction/domain/usecases/handlers/pos-transaction.handler.ts b/src/modules/transaction/transaction/domain/usecases/handlers/pos-transaction.handler.ts index 41e5128..1ae9744 100644 --- a/src/modules/transaction/transaction/domain/usecases/handlers/pos-transaction.handler.ts +++ b/src/modules/transaction/transaction/domain/usecases/handlers/pos-transaction.handler.ts @@ -19,6 +19,7 @@ import { TransactionCreateQueueEvent, } from '../../entities/event/transaction-change-status.event'; import { PriceCalculator } from '../calculator/price.calculator'; +import { Logger } from '@nestjs/common'; @EventsHandler(ChangeDocEvent) export class PosTransactionHandler implements IEventHandler { @@ -41,6 +42,7 @@ export class PosTransactionHandler implements IEventHandler { try { const database = event.data.database; const data = { ...event.data.data }; + Logger.log(`receipt data with code ${data?.code}`); // jika bukan database transaksi, return langsung if (database != 'transaction') return;