diff --git a/src/database/migrations/1725962197762-add-payment-date-bank-column-at-transaction.ts b/src/database/migrations/1725962197762-add-payment-date-bank-column-at-transaction.ts new file mode 100644 index 0000000..f8f7789 --- /dev/null +++ b/src/database/migrations/1725962197762-add-payment-date-bank-column-at-transaction.ts @@ -0,0 +1,19 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddPaymentDateBankColumnAtTransaction1725962197762 + implements MigrationInterface +{ + name = 'AddPaymentDateBankColumnAtTransaction1725962197762'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "transactions" ADD "payment_date_bank" date`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "transactions" DROP COLUMN "payment_date_bank"`, + ); + } +} diff --git a/src/modules/reports/shared/configs/transaction-report/configs/reconciliation.ts b/src/modules/reports/shared/configs/transaction-report/configs/reconciliation.ts index 365f8db..8396bfb 100644 --- a/src/modules/reports/shared/configs/transaction-report/configs/reconciliation.ts +++ b/src/modules/reports/shared/configs/transaction-report/configs/reconciliation.ts @@ -37,9 +37,17 @@ export default { format: DATA_FORMAT.TEXT, }, { - column: 'main__settlement_date', - query: 'main.settlement_date', - label: 'Tgl. Pendapatan', + column: 'main__payment_date', + query: 'main.payment_date', + label: 'Tgl. Transaksi', + type: DATA_TYPE.DIMENSION, + format: DATA_FORMAT.DATE_TIMESTAMP, + date_format: 'DD/MM/YYYY', + }, + { + column: 'main__payment_date_bank', + query: 'main.payment_date_bank', + label: 'Tgl. Transaksi Bank', type: DATA_TYPE.DIMENSION, format: DATA_FORMAT.DATE_TIMESTAMP, date_format: 'DD/MM/YYYY', @@ -136,8 +144,14 @@ export default { select_custom_options: [...Object.values(TransactionType)], }, { - filed_label: 'Tgl. Pendapatan', - filter_column: 'main__settlement_date', + filed_label: 'Tgl. Transaksi', + filter_column: 'main__payment_date', + field_type: FILTER_FIELD_TYPE.date_range_picker, + filter_type: FILTER_TYPE.DATE_IN_RANGE_TIMESTAMP, + }, + { + filed_label: 'Tgl. Transaksi Bank', + filter_column: 'main__payment_date_bank', field_type: FILTER_FIELD_TYPE.date_range_picker, filter_type: FILTER_TYPE.DATE_IN_RANGE_TIMESTAMP, }, diff --git a/src/modules/transaction/reconciliation/domain/usecases/managers/detail-reconciliation.manager.ts b/src/modules/transaction/reconciliation/domain/usecases/managers/detail-reconciliation.manager.ts index 0d8b25a..00a1270 100644 --- a/src/modules/transaction/reconciliation/domain/usecases/managers/detail-reconciliation.manager.ts +++ b/src/modules/transaction/reconciliation/domain/usecases/managers/detail-reconciliation.manager.ts @@ -43,6 +43,7 @@ export class DetailReconciliationManager extends BaseDetailManager