src/core/modules/domain/entities/base-filter.entity.ts

@@ -22,7 +22,6 @@ export interface Param {
   data: string[];
   additional?: any[];
   leftJoin?: any[];
-  isStatus?: boolean;
 }
 
 export interface RelationParam {

src/core/modules/domain/usecase/managers/base-index.manager.ts

@@ -52,15 +52,11 @@ export abstract class BaseIndexManager<Entity> extends BaseReadManager {
         // ? karena jika tidak, ketika dia search "active" maka "inactive" juga ikut
         return `'${STATUS[statusData.toUpperCase()]}'` ?? `'%${statusData}%'`;
       });
-
-      const exist = specificFilter.find((item) => item.isStatus);
-      if (!exist) {
       specificFilter.push({
         cols: `${this.tableName}.status::text`,
         data: data,
       });
     }
-    }
 
     new SpecificSearchFilter<Entity>(
       this.queryBuilder,

src/database/migrations/1722509262047-pos_log_add_column_down_by.ts

@@ -1,21 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-
-export class PosLogAddColumnDownBy1722509262047 implements MigrationInterface {
-  name = 'PosLogAddColumnDownBy1722509262047';
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `ALTER TABLE "logs_pos" ADD "drawn_by_name" character varying`,
-    );
-    await queryRunner.query(
-      `ALTER TABLE "logs_pos" ADD "drawn_by_id" character varying`,
-    );
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(`ALTER TABLE "logs_pos" DROP COLUMN "drawn_by_id"`);
-    await queryRunner.query(
-      `ALTER TABLE "logs_pos" DROP COLUMN "drawn_by_name"`,
-    );
-  }
-}

src/database/migrations/1722581313837-update-relation-table-transaction.ts

@@ -1,49 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-
-export class UpdateRelationTableTransaction1722581313837
-  implements MigrationInterface
-{
-  name = 'UpdateRelationTableTransaction1722581313837';
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `ALTER TABLE "refunds" DROP CONSTRAINT "FK_8bb3b7579f49990d2e77684acd4"`,
-    );
-    await queryRunner.query(
-      `ALTER TABLE "refunds" DROP CONSTRAINT "REL_8bb3b7579f49990d2e77684acd"`,
-    );
-    await queryRunner.query(
-      `ALTER TABLE "refund_items" DROP CONSTRAINT "FK_07b481a163c219f5de8fb1c90b3"`,
-    );
-    await queryRunner.query(
-      `ALTER TABLE "refund_items" DROP CONSTRAINT "REL_07b481a163c219f5de8fb1c90b"`,
-    );
-    await queryRunner.query(
-      `ALTER TABLE "refunds" ADD CONSTRAINT "FK_8bb3b7579f49990d2e77684acd4" FOREIGN KEY ("transaction_id") REFERENCES "transactions"("id") ON DELETE CASCADE ON UPDATE CASCADE`,
-    );
-    await queryRunner.query(
-      `ALTER TABLE "refund_items" ADD CONSTRAINT "FK_07b481a163c219f5de8fb1c90b3" FOREIGN KEY ("transaction_item_id") REFERENCES "transaction_items"("id") ON DELETE CASCADE ON UPDATE CASCADE`,
-    );
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `ALTER TABLE "refund_items" DROP CONSTRAINT "FK_07b481a163c219f5de8fb1c90b3"`,
-    );
-    await queryRunner.query(
-      `ALTER TABLE "refunds" DROP CONSTRAINT "FK_8bb3b7579f49990d2e77684acd4"`,
-    );
-    await queryRunner.query(
-      `ALTER TABLE "refund_items" ADD CONSTRAINT "REL_07b481a163c219f5de8fb1c90b" UNIQUE ("transaction_item_id")`,
-    );
-    await queryRunner.query(
-      `ALTER TABLE "refund_items" ADD CONSTRAINT "FK_07b481a163c219f5de8fb1c90b3" FOREIGN KEY ("transaction_item_id") REFERENCES "transaction_items"("id") ON DELETE CASCADE ON UPDATE CASCADE`,
-    );
-    await queryRunner.query(
-      `ALTER TABLE "refunds" ADD CONSTRAINT "REL_8bb3b7579f49990d2e77684acd" UNIQUE ("transaction_id")`,
-    );
-    await queryRunner.query(
-      `ALTER TABLE "refunds" ADD CONSTRAINT "FK_8bb3b7579f49990d2e77684acd4" FOREIGN KEY ("transaction_id") REFERENCES "transactions"("id") ON DELETE CASCADE ON UPDATE CASCADE`,
-    );
-  }
-}

src/modules/configuration/log/data/models/pos-log.model.ts

@@ -25,10 +25,4 @@ export class PosLogModel
 
   @Column('varchar', { name: 'creator_id', nullable: true })
   creator_id: string;
-
-  @Column('varchar', { name: 'drawn_by_name', nullable: true })
-  drawn_by_name: string;
-
-  @Column('varchar', { name: 'drawn_by_id', nullable: true })
-  drawn_by_id: string;
 }

src/modules/configuration/log/domain/handlers/pos-log.handler.ts

@@ -27,9 +27,7 @@ export class RecordPosLogHandler implements IEventHandler<ChangeDocEvent> {
         total_balance: data.withdrawal_cash ?? data.opening_cash_balance,
         pos_number: data.pos_number,
         creator_id: data.pos_admin?.id,
-        creator_name: data.pos_admin?.name ?? data.pos_admin?.username,
+        creator_name: data.pos_admin?.name,
-        drawn_by_id: data.withdraw_user?.id,
-        drawn_by_name: data.withdraw_user?.name ?? data.withdraw_user?.username,
         created_at: data.created_at,
       });
 

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

@@ -16,13 +16,6 @@ export default <ReportConfigEntity>{
   table_schema: `transactions AS main
   LEFT JOIN refunds refund ON refund.transaction_id = main.id`,
   main_table_alias: 'main',
-  whereDefaultConditions: [
-    {
-      column: 'main.type',
-      filter_type: FILTER_TYPE.TEXT_IN_MEMBER,
-      values: [TransactionType.ADMIN, TransactionType.ONLINE],
-    },
-  ],
   defaultOrderBy: [],
   lowLevelOrderBy: [],
   filter_period_config: {
@@ -48,7 +41,7 @@ export default <ReportConfigEntity>{
     {
       column: 'main__no_of_group',
       query: 'main.no_of_group',
-      label: '#Visitor',
+      label: 'Total Group',
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.NUMBER,
     },

src/modules/reports/shared/configs/transaction-report/configs/cash-withdrawals.ts

@@ -1,87 +1,40 @@
-import { PosLogType } from 'src/modules/configuration/log/domain/entities/pos-log.entity';
+import { DATA_FORMAT, DATA_TYPE, REPORT_GROUP } from '../../../constant';
-import {
-  DATA_FORMAT,
-  DATA_TYPE,
-  FILTER_FIELD_TYPE,
-  FILTER_TYPE,
-  REPORT_GROUP,
-} from '../../../constant';
 import { ReportConfigEntity } from '../../../entities/report-config.entity';
 
 export default <ReportConfigEntity>{
   group_name: REPORT_GROUP.transaction_report,
   unique_name: `${REPORT_GROUP.transaction_report}__cash_withdrawals`,
   label: 'Penarikan Kas',
-  table_schema: 'logs_pos main',
+  table_schema: 'season_types main',
   main_table_alias: 'main',
   defaultOrderBy: [],
   lowLevelOrderBy: [],
   filter_period_config: {
     hidden: true,
   },
-  whereDefaultConditions: [
+
-    {
-      column: 'main.type',
-      filter_type: FILTER_TYPE.TEXT_IN_MEMBER,
-      values: [PosLogType.cash_witdrawal],
-    },
-  ],
   column_configs: [
     {
-      column: 'main__date',
+      column: 'main__created_at',
-      query: `TO_CHAR(to_timestamp(main.created_at::double precision / 1000), 'DD-MM-YYYY')`,
+      query: 'main.created_at',
-      label: 'Tanggal',
+      label: 'Created Date',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.TEXT,
+      format: DATA_FORMAT.DATE_EPOCH,
     },
     {
-      column: 'main__time',
+      column: 'main__updated_at',
-      query: `TO_CHAR(to_timestamp(main.created_at::double precision / 1000), 'HH24:MI')`,
+      query: 'main.updated_at',
-      label: 'Jam',
+      label: 'Updated Date',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.TEXT,
+      format: DATA_FORMAT.DATE_EPOCH,
     },
     {
-      column: 'main__drawn_by_name',
+      column: 'main__name',
-      query: 'main.drawn_by_name',
+      query: 'main.name',
-      label: 'Nama Penarik',
+      label: 'Name',
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
     },
-    {
-      column: 'main__creator_name',
-      query: 'main.creator_name',
-      label: 'Nama Kasir',
-      type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.TEXT,
-    },
-    {
-      column: 'main__pos_number',
-      query: 'main.pos_number',
-      label: 'No. PoS',
-      type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.TEXT,
-    },
-    {
-      column: 'main__total_balance',
-      query: 'main.total_balance',
-      label: 'Total Penarikan',
-      type: DATA_TYPE.MEASURE,
-      format: DATA_FORMAT.CURRENCY,
-    },
-  ],
-  filter_configs: [
-    {
-      filed_label: 'Nama Penarik',
-      filter_column: 'main__drawn_by_name',
-      field_type: FILTER_FIELD_TYPE.input_tag,
-      filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS,
-    },
-    {
-      filed_label: 'Nama Kasir',
-      filter_column: 'main__creator_name',
-      field_type: FILTER_FIELD_TYPE.input_tag,
-      filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS,
-    },
   ],
+  filter_configs: [],
 };

src/modules/reports/shared/configs/transaction-report/configs/cashier-log.ts

@@ -1,81 +1,40 @@
-import { PosLogType } from 'src/modules/configuration/log/domain/entities/pos-log.entity';
+import { DATA_FORMAT, DATA_TYPE, REPORT_GROUP } from '../../../constant';
-import {
-  DATA_FORMAT,
-  DATA_TYPE,
-  FILTER_FIELD_TYPE,
-  FILTER_TYPE,
-  REPORT_GROUP,
-} from '../../../constant';
 import { ReportConfigEntity } from '../../../entities/report-config.entity';
 
 export default <ReportConfigEntity>{
   group_name: REPORT_GROUP.transaction_report,
   unique_name: `${REPORT_GROUP.transaction_report}__cashier_log`,
   label: 'Kasir Log',
-  table_schema: 'logs_pos main',
+  table_schema: 'season_types main',
   main_table_alias: 'main',
   defaultOrderBy: [],
   lowLevelOrderBy: [],
   filter_period_config: {
     hidden: true,
   },
-  whereDefaultConditions: [
+
-    {
-      column: 'main.type',
-      filter_type: FILTER_TYPE.TEXT_IN_MEMBER,
-      values: [PosLogType.login, PosLogType.logout],
-    },
-  ],
   column_configs: [
     {
-      column: 'main__date',
+      column: 'main__created_at',
-      query: `TO_CHAR(to_timestamp(main.created_at::double precision / 1000), 'DD-MM-YYYY')`,
+      query: 'main.created_at',
-      label: 'Tanggal',
+      label: 'Created Date',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.TEXT,
+      format: DATA_FORMAT.DATE_EPOCH,
     },
     {
-      column: 'main__time',
+      column: 'main__updated_at',
-      query: `TO_CHAR(to_timestamp(main.created_at::double precision / 1000), 'HH24:MI')`,
+      query: 'main.updated_at',
-      label: 'Jam',
+      label: 'Updated Date',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.TEXT,
+      format: DATA_FORMAT.DATE_EPOCH,
     },
     {
-      column: 'main__type',
+      column: 'main__name',
-      query: 'main.type',
+      query: 'main.name',
-      label: 'Tipe',
+      label: 'Name',
-      type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.TEXT,
-    },
-    {
-      column: 'main__creator_name',
-      query: 'main.creator_name',
-      label: 'Nama Staff',
-      type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.TEXT,
-    },
-    {
-      column: 'main__pos_number',
-      query: 'main.pos_number',
-      label: 'No. PoS',
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
     },
   ],
-  filter_configs: [
+  filter_configs: [],
-    {
-      filed_label: 'Tipe',
-      filter_column: 'main__type',
-      field_type: FILTER_FIELD_TYPE.select,
-      filter_type: FILTER_TYPE.TEXT_IN_MEMBER,
-      select_custom_options: [PosLogType.login, PosLogType.logout],
-    },
-    {
-      filed_label: 'Nama Staff',
-      filter_column: 'main__creator_name',
-      field_type: FILTER_FIELD_TYPE.input_tag,
-      filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS,
-    },
-  ],
 };

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

@@ -18,6 +18,6 @@ export const TransactionReportConfig: ReportConfigEntity[] = [
   // TimePerRideReport,
   BookingReport,
   RefundsReport,
-  CashierLogReport,
+  // CashierLogReport,
-  CashWithdrawalsReport,
+  // CashWithdrawalsReport,
 ];

src/modules/reports/shared/entities/report-config.entity.ts

@@ -37,11 +37,11 @@ export interface ReportConfigEntity {
 
   table_schema: string;
   main_table_alias?: string;
-  // customVirtualTableSchema?(
+  customVirtualTableSchema?(
-  //   filterModel: any,
+    filterModel: any,
-  //   findQueryConfig: (column: string) => string,
+    findQueryConfig: (column: string) => string,
-  //   createFilterSql: (key: string, item: any) => string,
+    createFilterSql: (key: string, item: any) => string,
-  // ): string;
+  ): string;
   whereCondition?(filterModel: any): string[];
   whereDefaultConditions?: {
     column: string;

src/modules/transaction/reconciliation/domain/usecases/managers/index-reconciliation.manager.ts

@@ -65,11 +65,6 @@ export class IndexReconciliationManager extends BaseIndexManager<TransactionEnti
 
   get specificFilter(): Param[] {
     return [
-      {
-        cols: `${this.tableName}.reconciliation_status::text`,
-        data: this.filterParam.statuses,
-        isStatus: true,
-      },
       {
         cols: `${this.tableName}.customer_name`,
         data: this.filterParam.customer_names,
@@ -120,46 +115,36 @@ export class IndexReconciliationManager extends BaseIndexManager<TransactionEnti
 
     if (this.filterParam.payment_type) {
       queryBuilder.andWhere(
-        `${this.tableName}.payment_type::text In (:...paymentType)`,
+        `${this.tableName}.creator_counter_no In (:...counters)`,
         {
-          paymentType: [this.filterParam.payment_type],
+          counters: [this.filterParam.couner_no],
         },
       );
     }
 
     if (this.filterParam.payment_via) {
-      queryBuilder.andWhere(
+      queryBuilder.andWhere(`${this.tableName}.payment_type In (:...type)`, {
-        `${this.tableName}.payment_type::text In (:...type)`,
+        type: [this.filterParam.payment_via],
-        {
+      });
-          type: [`%${this.filterParam.payment_via}%`],
-        },
-      );
     }
 
     if (this.filterParam.payment_bank) {
       queryBuilder.andWhere(
-        `${this.tableName}.payment_type_method_name::text In (:...banks)`,
+        `${this.tableName}.payment_type_method_name In (:...banks)`,
         {
-          banks: [`%${this.filterParam.payment_bank}%`],
+          banks: [this.filterParam.payment_bank],
         },
       );
     }
 
     if (this.filterParam.confirmation_date_from) {
-      const confirmationDateFrom = new Date(
-        this.filterParam?.confirmation_date_from,
-      ).getTime();
-      const confirmationDateTo = new Date(
-        `${this.filterParam?.confirmation_date_to?.split(' ')[0]} 23:59:59`,
-      ).getTime();
-
       new BetweenQueryHelper(
         queryBuilder,
         this.tableName,
-        'reconciliation_confirm_date',
+        'payment_date',
-        confirmationDateFrom,
+        this.filterParam.confirmation_date_from,
-        confirmationDateTo,
+        this.filterParam.confirmation_date_to,
-        'reconciliation_confirm_dated',
+        'payment_created',
       ).getQuery();
     }
 

src/modules/transaction/reconciliation/domain/usecases/managers/recap-reconciliation.manager.ts

@@ -86,6 +86,8 @@ export class RecapReconciliationManager extends BaseCustomManager<TransactionEnt
         where: query,
       });
 
+      if (payment_type == 'cash') console.log(exist, 'das', query);
+
       const new_recap = new TransactionModel();
       const total = _.sumBy(this.recapTransactions[recap], (recap) =>
         parseFloat(recap.payment_total),

src/modules/transaction/refund/data/models/refund-item.model.ts

@@ -29,7 +29,7 @@ export class RefundItemModel
   // transaction to transaction item
   @Column('varchar', { name: 'transaction_item_id', nullable: true })
   transaction_item_id: string;
-  @ManyToOne(() => TransactionItemModel, (model) => model.refunds, {
+  @OneToOne(() => TransactionItemModel, (model) => model.refund, {
     onDelete: 'CASCADE',
     onUpdate: 'CASCADE',
   })

src/modules/transaction/refund/data/models/refund.model.ts

@@ -1,6 +1,6 @@
 import { TABLE_NAME } from 'src/core/strings/constants/table.constants';
 import { RefundEntity } from '../../domain/entities/refund.entity';
-import { Column, Entity, JoinColumn, ManyToOne, OneToMany } from 'typeorm';
+import { Column, Entity, JoinColumn, OneToMany, OneToOne } from 'typeorm';
 import { BaseStatusModel } from 'src/core/modules/data/model/base-status.model';
 import { TransactionModel } from 'src/modules/transaction/transaction/data/models/transaction.model';
 import { RefundItemModel } from './refund-item.model';
@@ -64,7 +64,7 @@ export class RefundModel
   // relation to transaction
   @Column('varchar', { name: 'transaction_id', nullable: true })
   transaction_id: string;
-  @ManyToOne(() => TransactionModel, (model) => model.refunds, {
+  @OneToOne(() => TransactionModel, (model) => model.refund, {
     onDelete: 'CASCADE',
     onUpdate: 'CASCADE',
   })

src/modules/transaction/refund/domain/usecases/managers/batch-confirm-refund.manager.ts

@@ -38,6 +38,7 @@ export class BatchConfirmRefundManager extends BaseBatchUpdateStatusManager<Refu
 
     if (this.data.status == STATUS.DRAFT) {
       Object.assign(this.data, {
+        code: `RF-${data?.['transaction']?.invoice_code.split('-')[1]}`,
         request_date: new Date(),
         status: STATUS.PENDING,
       });

src/modules/transaction/refund/domain/usecases/managers/confirm-refund.manager.ts

@@ -53,6 +53,7 @@ export class ConfirmRefundManager extends BaseUpdateStatusManager<RefundEntity>
 
     if (data.status == STATUS.DRAFT) {
       Object.assign(this.data, {
+        code: `RF-${data.transaction?.invoice_code?.split('-')[1]}`,
         request_date: new Date(),
         status: STATUS.PENDING,
       });

src/modules/transaction/refund/domain/usecases/managers/create-refund.manager.ts

@@ -13,8 +13,6 @@ import { RefundModel } from '../../../data/models/refund.model';
 import { BaseCreateManager } from 'src/core/modules/domain/usecase/managers/base-create.manager';
 import { RefundCreatedEvent } from '../../entities/event/refund-created.event';
 import { STATUS } from 'src/core/strings/constants/base.constants';
-import { In, Not } from 'typeorm';
-import { generateInvoiceCodeHelper } from 'src/modules/transaction/transaction/domain/usecases/managers/helpers/generate-invoice-code.helper';
 
 @Injectable()
 export class CreateRefundManager extends BaseCreateManager<RefundEntity> {
@@ -28,10 +26,13 @@ export class CreateRefundManager extends BaseCreateManager<RefundEntity> {
       };
     });
 
+    Object.assign(this.data, {
+      refund_items: refund_items,
+    });
+
     const exist = await this.dataService.getOneByOptions({
       where: {
         transaction_id: this.data.transaction.id,
-        status: Not(In([STATUS.CANCEL])),
       },
     });
     if (exist) {
@@ -56,11 +57,6 @@ export class CreateRefundManager extends BaseCreateManager<RefundEntity> {
         error: 'Unprocessable Entity',
       });
     }
-
-    Object.assign(this.data, {
-      refund_items: refund_items,
-      code: await generateInvoiceCodeHelper(this.dataService, 'RF'),
-    });
     return;
   }
 

src/modules/transaction/refund/domain/usecases/managers/detail-refund.manager.ts

@@ -15,7 +15,7 @@ export class DetailRefundManager extends BaseDetailManager<RefundEntity> {
   }
 
   async afterProcess(): Promise<void> {
-    mappingTransaction(this.result['transaction'], this.dataId);
+    mappingTransaction(this.result['transaction']);
     return;
   }
 
@@ -25,12 +25,7 @@ export class DetailRefundManager extends BaseDetailManager<RefundEntity> {
       joinRelations: [],
 
       // relation join and select (relasi yang ingin ditampilkan),
-      selectRelations: [
+      selectRelations: ['transaction', 'transaction.items', 'items.refund'],
-        'transaction',
-        'transaction.items',
-        'items.refunds item_refunds',
-        'item_refunds.refund item_refunds_refund',
-      ],
 
       // relation yang hanya ingin dihitung (akan return number)
       countRelations: [],
@@ -60,9 +55,7 @@ export class DetailRefundManager extends BaseDetailManager<RefundEntity> {
 
       'transaction',
       'items',
-      'item_refunds',
+      'refund',
-      'item_refunds_refund.id',
-      'item_refunds_refund.status',
     ];
   }
 

src/modules/transaction/transaction/data/models/transaction-item.model.ts

@@ -1,5 +1,5 @@
 import { TABLE_NAME } from 'src/core/strings/constants/table.constants';
-import { Column, Entity, JoinColumn, ManyToOne, OneToMany } from 'typeorm';
+import { Column, Entity, JoinColumn, ManyToOne, OneToOne } from 'typeorm';
 import { BaseCoreModel } from 'src/core/modules/data/model/base-core.model';
 import { TransactionItemEntity } from '../../domain/entities/transaction-item.entity';
 import { TransactionModel } from './transaction.model';
@@ -80,10 +80,10 @@ export class TransactionItemModel
   transaction: TransactionModel;
 
   // relations to refund
-  @OneToMany(() => RefundItemModel, (model) => model.transaction_item, {
+  @OneToOne(() => RefundItemModel, (model) => model.transaction_item, {
     cascade: true,
     onDelete: 'CASCADE',
     onUpdate: 'CASCADE',
   })
-  refunds: RefundItemModel[];
+  refund: RefundItemModel;
 }

src/modules/transaction/transaction/data/models/transaction.model.ts

@@ -1,6 +1,6 @@
 import { TABLE_NAME } from 'src/core/strings/constants/table.constants';
 import { TransactionEntity } from '../../domain/entities/transaction.entity';
-import { Column, Entity, OneToMany } from 'typeorm';
+import { Column, Entity, OneToMany, OneToOne } from 'typeorm';
 import { BaseStatusModel } from 'src/core/modules/data/model/base-status.model';
 import {
   TransactionType,
@@ -233,10 +233,10 @@ export class TransactionModel
   taxes: TransactionTaxModel[];
 
   // relations to refund
-  @OneToMany(() => RefundModel, (model) => model.transaction, {
+  @OneToOne(() => RefundModel, (model) => model.transaction, {
     cascade: true,
     onDelete: 'CASCADE',
     onUpdate: 'CASCADE',
   })
-  refunds: RefundModel[];
+  refund: RefundModel;
 }

src/modules/transaction/transaction/domain/usecases/managers/detail-transaction.manager.ts

@@ -25,12 +25,7 @@ export class DetailTransactionManager extends BaseDetailManager<TransactionEntit
       joinRelations: [],
 
       // relation join and select (relasi yang ingin ditampilkan),
-      selectRelations: [
+      selectRelations: ['items', 'items.refund item_refund', 'refund'],
-        'items',
-        'items.refunds item_refunds',
-        'item_refunds.refund item_refunds_refund',
-        'refunds',
-      ],
 
       // relation yang hanya ingin dihitung (akan return number)
       countRelations: [],
@@ -81,11 +76,8 @@ export class DetailTransactionManager extends BaseDetailManager<TransactionEntit
       `${this.tableName}.payment_total`,
 
       'items',
-      'item_refunds',
+      'item_refund',
-      'item_refunds_refund.id',
+      'refund',
-      'item_refunds_refund.status',
-
-      'refunds',
     ];
   }
 

src/modules/transaction/transaction/domain/usecases/managers/helpers/generate-invoice-code.helper.ts

@@ -12,12 +12,6 @@ export async function generateInvoiceCodeHelper(dataService, code) {
     invoice_code: ILike(`%${month_year}%`),
   };
 
-  if (code == 'RF') {
-    query = {
-      code: ILike(`%${month_year}%`),
-    };
-  }
-
   if (code == 'PYM') {
     query = {
       payment_code: ILike(`%${month_year}%`),

src/modules/transaction/transaction/domain/usecases/managers/helpers/mapping-transaction.helper.ts

@@ -4,7 +4,7 @@ import {
   TransactionType,
 } from 'src/modules/transaction/transaction/constants';
 
-export function mappingTransaction(data, refundId?: string) {
+export function mappingTransaction(data) {
   let payment_type_bank: any = null;
   const season_period = {
     id: data.season_period_id,
@@ -26,9 +26,6 @@ export function mappingTransaction(data, refundId?: string) {
 
   const items = data?.['items']?.map((itemData) => {
     let tenant;
-    let refund = itemData.refunds?.find(
-      (item) => ![STATUS.CANCEL].includes(item.refund.status),
-    );
 
     if (itemData.item_tenant_id) {
       tenant = {
@@ -38,9 +35,6 @@ export function mappingTransaction(data, refundId?: string) {
       };
     }
 
-    if (refundId)
-      refund = itemData.refunds?.find((item) => item.refund.id == refundId);
-
     return {
       item: {
         id: itemData.item_id,
@@ -55,27 +49,20 @@ export function mappingTransaction(data, refundId?: string) {
         },
       },
       id: itemData.id,
-      refund: refund,
+      refund: itemData.refund,
       qty: itemData.qty,
       qty_remaining: itemData.qty_remaining,
-      total_price_refund: refund?.refund_total ?? 0,
+      total_price_refund: itemData.refund?.refund_total ?? 0,
       total_price: itemData.total_price,
     };
   });
 
-  const refund = data.refunds?.find(
-    (refund) => ![STATUS.CANCEL].includes(refund.status),
-  );
-
   Object.assign(data, {
     season_period: season_period,
     items: items,
     payment_type_bank: payment_type_bank,
-    refund: refund,
   });
 
-  delete data.refunds;
-
   delete data.season_period_id;
   delete data.season_period_name;
   delete data.season_period_type_id;

src/modules/transaction/transaction/domain/usecases/managers/index-transaction.manager.ts

@@ -7,7 +7,6 @@ import {
   RelationParam,
 } from 'src/core/modules/domain/entities/base-filter.entity';
 import { BetweenQueryHelper } from 'src/core/helpers/query/between-query.helper';
-import { STATUS } from 'src/core/strings/constants/base.constants';
 
 @Injectable()
 export class IndexTransactionManager extends BaseIndexManager<TransactionEntity> {
@@ -21,16 +20,12 @@ export class IndexTransactionManager extends BaseIndexManager<TransactionEntity>
 
   async afterProcess(): Promise<void> {
     this.result?.data?.map((item) => {
-      const activeRefund = item['refunds'].find(
-        (refund) => ![STATUS.CANCEL].includes(refund.status),
-      );
-
       Object.assign(item, {
-        refund_code: activeRefund?.code ?? null,
+        refund_code: item['refund']?.code ?? null,
-        refund_date: activeRefund?.refund_date ?? null,
+        refund_date: item['refund']?.refund_date ?? null,
       });
 
-      delete item['refunds'];
+      delete item['refund'];
     });
     return;
   }
@@ -41,7 +36,7 @@ export class IndexTransactionManager extends BaseIndexManager<TransactionEntity>
       joinRelations: [],
 
       // relation join and select (relasi yang ingin ditampilkan),
-      selectRelations: ['items', 'refunds'],
+      selectRelations: ['items', 'refund'],
 
       // relation yang hanya ingin dihitung (akan return number)
       countRelations: [],
@@ -81,10 +76,10 @@ export class IndexTransactionManager extends BaseIndexManager<TransactionEntity>
       `${this.tableName}.payment_type_method_name`,
       `${this.tableName}.payment_type_method_number`,
 
-      `refunds.id`,
+      `refund.id`,
-      `refunds.code`,
+      `refund.code`,
-      `refunds.refund_date`,
+      `refund.refund_date`,
-      `refunds.request_date`,
+      `refund.request_date`,
     ];
   }