src/modules/configuration/couch/data/services/couch.service.ts

@@ -100,7 +100,7 @@ export class CouchService {
   public async totalTodayTransactions(database = 'transaction') {
     try {
       const nano = this.nanoInstance;
-      const db = nano.use<any>(database);
+      const db = nano.use(database);
 
       // Get today's start timestamp (midnight)
       const today = new Date();
@@ -116,14 +116,10 @@ export class CouchService {
 
       const result = await db.find({
         selector: selector,
-        fields: ['_id', 'payment_total_pay'],
+        fields: ['_id'],
-        limit: 10000,
       });
 
-      return result.docs.reduce(
+      return result.docs.length;
-        (sum, doc) => sum + (doc.payment_total_pay || 0),
-        0,
-      );
     } catch (error) {
       console.log(error);
       apm.captureError(error);

src/modules/reports/shared/configs/transaction-report/configs/cancel-transaction.ts

@@ -42,16 +42,9 @@ export default <ReportConfigEntity>{
   },
 
   column_configs: [
-    // {
-    //   column: 'main__payment_date',
-    //   query: `to_char(main.payment_date, 'DD-MM-YYYY')`,
-    //   label: 'Tgl. Pendapatan',
-    //   type: DATA_TYPE.DIMENSION,
-    //   format: DATA_FORMAT.TEXT,
-    // },
     {
       column: 'main__payment_date',
-      query: `to_char(cast(to_timestamp(main.created_at/1000) as date),'DD-MM-YYYY')`,
+      query: `to_char(main.payment_date, 'DD-MM-YYYY')`,
       label: 'Tgl. Pendapatan',
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
@@ -289,22 +282,15 @@ export default <ReportConfigEntity>{
     },
   ],
   filter_configs: [
-    // {
-    //   filed_label: 'Tgl. Pembatalan',
-    //   filter_column: 'main__payment_date',
-    //   field_type: FILTER_FIELD_TYPE.date_range_picker,
-    //   filter_type: FILTER_TYPE.DATE_IN_RANGE_TIMESTAMP,
-    //   // date_format: 'DD-MM-YYYY',
-    //   date_format: 'YYYY-MM-DD',
-    // },
-
     {
       filed_label: 'Tgl. Pembatalan',
       filter_column: 'main__payment_date',
       field_type: FILTER_FIELD_TYPE.date_range_picker,
       filter_type: FILTER_TYPE.DATE_IN_RANGE_TIMESTAMP,
-      date_format: 'DD-MM-YYYY',
+      // date_format: 'DD-MM-YYYY',
+      date_format: 'YYYY-MM-DD',
     },
+
     {
       filed_label: 'Sumber',
       filter_column: 'main__type',
@@ -406,9 +392,8 @@ export default <ReportConfigEntity>{
     },
   ],
   customQueryColumn(column) {
-    // if (column === 'main__payment_date') return 'main.payment_date';
+    if (column === 'main__payment_date') return 'main.payment_date';
-    // else if (column === 'refund__refund_date') return 'refund.refund_date';
+    else if (column === 'refund__refund_date') return 'refund.refund_date';
-    if (column === 'refund__refund_date') return 'refund.refund_date';
     return;
   },
 };

src/modules/reports/shared/configs/transaction-report/configs/income.ts

@@ -255,14 +255,7 @@ export default <ReportConfigEntity>{
     {
       column: 'main__payment_card_information',
       query: 'main.payment_card_information',
-      label: 'Card Information',
+      label: 'Information',
-      type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.TEXT,
-    },
-    {
-      column: 'main__payment_code_reference',
-      query: 'main.payment_code_reference',
-      label: 'Payment Reference',
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
     },
@@ -341,18 +334,6 @@ export default <ReportConfigEntity>{
       field_type: FILTER_FIELD_TYPE.input_tag,
       filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS,
     },
-    {
-      filed_label: 'Card Information',
-      filter_column: 'main__payment_card_information',
-      field_type: FILTER_FIELD_TYPE.input_tag,
-      filter_type: FILTER_TYPE.TEXT_IN_MEMBER,
-    },
-    {
-      filed_label: 'Payment Reference',
-      filter_column: 'main__payment_code_reference',
-      field_type: FILTER_FIELD_TYPE.input_tag,
-      filter_type: FILTER_TYPE.TEXT_IN_MEMBER,
-    },
     {
       filed_label: 'Tgl. Pengembalian',
       filter_column: 'refund__refund_date',

src/modules/transaction/sales-price-formula/data/services/sales-price-formula-data.service.ts

@@ -14,13 +14,12 @@ import {
   TransactionSettingModel,
 } from '../models/sales-price-formula.model';
 import { CONNECTION_NAME } from 'src/core/strings/constants/base.constants';
-import { Repository } from 'typeorm';
+import { MoreThan, Repository } from 'typeorm';
 import { FormulaType } from '../../constants';
 import { TaxModel } from 'src/modules/transaction/tax/data/models/tax.model';
 import { ItemModel } from 'src/modules/item-related/item/data/models/item.model';
 import { TransactionModel } from 'src/modules/transaction/transaction/data/models/transaction.model';
 import { CouchService } from 'src/modules/configuration/couch/data/services/couch.service';
-import { TransactionType } from 'src/modules/transaction/transaction/constants';
 
 @Injectable()
 export class SalesPriceFormulaDataService extends BaseDataService<SalesPriceFormulaEntity> {
@@ -68,17 +67,11 @@ export class SalesPriceFormulaDataService extends BaseDataService<SalesPriceForm
 
     const todayTimestamp = today.getTime();
 
-    const totalTransactions = parseInt(
+    const totalTransactions = await this.transaction.count({
-      await this.transaction
+      where: {
-        .createQueryBuilder('transaction')
+        created_at: MoreThan(todayTimestamp),
-        .select('SUM(transaction.payment_total_pay)', 'sum')
+      },
-        .where('transaction.created_at > :timestamp', {
+    });
-          timestamp: todayTimestamp,
-        })
-        .andWhere('transaction.type = :type', { type: TransactionType.COUNTER })
-        .getRawOne()
-        .then((result) => result.sum || 0),
-    );
 
     const couchTransaction = await this.couchService.totalTodayTransactions();
 

src/modules/transaction/sales-price-formula/sales-price-formula.module.ts

@@ -23,7 +23,7 @@ import { TaxModel } from '../tax/data/models/tax.model';
 import { ItemModel } from 'src/modules/item-related/item/data/models/item.model';
 import { UpdateTransactionSettingManager } from './domain/usecases/managers/update-transaction-setting.manager';
 import { TransactionModel } from '../transaction/data/models/transaction.model';
-import { CouchModule } from 'src/modules/configuration/couch/couch.module';
+import { CouchService } from 'src/modules/configuration/couch/data/services/couch.service';
 
 @Global()
 @Module({
@@ -40,7 +40,6 @@ import { CouchModule } from 'src/modules/configuration/couch/couch.module';
       CONNECTION_NAME.DEFAULT,
     ),
     CqrsModule,
-    CouchModule,
   ],
   controllers: [
     SalesPriceFormulaDataController,
@@ -58,6 +57,7 @@ import { CouchModule } from 'src/modules/configuration/couch/couch.module';
 
     SalesPriceFormulaDataOrchestrator,
     SalesPriceFormulaReadOrchestrator,
+    CouchService,
   ],
   exports: [SalesPriceFormulaDataService, SalesPriceFormulaReadService],
 })

src/modules/transaction/transaction/transaction.module.ts

@@ -46,7 +46,7 @@ import { PaymentMethodModel } from '../payment-method/data/models/payment-method
 import { TransactionDemographyModel } from './data/models/transaction-demography.model';
 import { PriceCalculator } from './domain/usecases/calculator/price.calculator';
 import { ItemModel } from 'src/modules/item-related/item/data/models/item.model';
-import { CouchModule } from 'src/modules/configuration/couch/couch.module';
+import { CouchService } from 'src/modules/configuration/couch/data/services/couch.service';
 
 @Module({
   exports: [TransactionReadService],
@@ -70,7 +70,6 @@ import { CouchModule } from 'src/modules/configuration/couch/couch.module';
       CONNECTION_NAME.DEFAULT,
     ),
     CqrsModule,
-    CouchModule,
   ],
   controllers: [TransactionDataController, TransactionReadController],
   providers: [
@@ -102,6 +101,8 @@ import { CouchModule } from 'src/modules/configuration/couch/couch.module';
 
     TransactionDataOrchestrator,
     TransactionReadOrchestrator,
+
+    CouchService,
   ],
 })
 export class TransactionModule {}