Merge pull request 'feat: add column and filter payment reference at report income' (#139) from feat/report-income into production

Reviewed-on: #139

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(database);
+      const db = nano.use<any>(database);
 
       // Get today's start timestamp (midnight)
       const today = new Date();
@@ -116,10 +116,14 @@ export class CouchService {
 
       const result = await db.find({
         selector: selector,
-        fields: ['_id'],
+        fields: ['_id', 'payment_total_pay'],
+        limit: 10000,
       });
 
-      return result.docs.length;
+      return result.docs.reduce(
+        (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,9 +42,16 @@ 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(main.payment_date, 'DD-MM-YYYY')`,
+      query: `to_char(cast(to_timestamp(main.created_at/1000) as date),'DD-MM-YYYY')`,
       label: 'Tgl. Pendapatan',
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
@@ -282,15 +289,22 @@ 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',
@@ -392,8 +406,9 @@ 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,7 +255,14 @@ export default <ReportConfigEntity>{
     {
       column: 'main__payment_card_information',
       query: 'main.payment_card_information',
-      label: 'Information',
+      label: 'Card 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,
     },
@@ -334,6 +341,18 @@ 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,12 +14,13 @@ import {
   TransactionSettingModel,
 } from '../models/sales-price-formula.model';
 import { CONNECTION_NAME } from 'src/core/strings/constants/base.constants';
-import { MoreThan, Repository } from 'typeorm';
+import { 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> {
@@ -67,11 +68,17 @@ export class SalesPriceFormulaDataService extends BaseDataService<SalesPriceForm
 
     const todayTimestamp = today.getTime();
 
-    const totalTransactions = await this.transaction.count({
+    const totalTransactions = parseInt(
-      where: {
+      await this.transaction
-        created_at: MoreThan(todayTimestamp),
+        .createQueryBuilder('transaction')
-      },
+        .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 { CouchService } from 'src/modules/configuration/couch/data/services/couch.service';
+import { CouchModule } from 'src/modules/configuration/couch/couch.module';
 
 @Global()
 @Module({
@@ -40,6 +40,7 @@ import { CouchService } from 'src/modules/configuration/couch/data/services/couc
       CONNECTION_NAME.DEFAULT,
     ),
     CqrsModule,
+    CouchModule,
   ],
   controllers: [
     SalesPriceFormulaDataController,
@@ -57,7 +58,6 @@ import { CouchService } from 'src/modules/configuration/couch/data/services/couc
 
     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 { CouchService } from 'src/modules/configuration/couch/data/services/couch.service';
+import { CouchModule } from 'src/modules/configuration/couch/couch.module';
 
 @Module({
   exports: [TransactionReadService],
@@ -70,6 +70,7 @@ import { CouchService } from 'src/modules/configuration/couch/data/services/couc
       CONNECTION_NAME.DEFAULT,
     ),
     CqrsModule,
+    CouchModule,
   ],
   controllers: [TransactionDataController, TransactionReadController],
   providers: [
@@ -101,8 +102,6 @@ import { CouchService } from 'src/modules/configuration/couch/data/services/couc
 
     TransactionDataOrchestrator,
     TransactionReadOrchestrator,
-
-    CouchService,
   ],
 })
 export class TransactionModule {}