From 76fa380f1e9cf69cf68b0ec41289d01252a93b19 Mon Sep 17 00:00:00 2001 From: Aswin Ashar Abdullah Date: Fri, 26 Jul 2024 16:49:52 +0700 Subject: [PATCH] fix(SPG-657) Kode Pembayaran - ketika booking status waiting di confirm di rekonsiliasi, kode pembayaran tidak muncul --- .../batch-confirm-reconciliation.manager.ts | 12 +++++------- .../managers/confirm-reconciliation.manager.ts | 5 +++++ .../batch-confirm-transaction.manager.ts | 2 +- .../managers/confirm-transaction.manager.ts | 2 +- .../helpers/generate-invoice-code.helper.ts | 17 ++++++++++++----- .../helpers/mapping-transaction.helper.ts | 1 + 6 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/modules/transaction/reconciliation/domain/usecases/managers/batch-confirm-reconciliation.manager.ts b/src/modules/transaction/reconciliation/domain/usecases/managers/batch-confirm-reconciliation.manager.ts index 3f3df81..c8ae532 100644 --- a/src/modules/transaction/reconciliation/domain/usecases/managers/batch-confirm-reconciliation.manager.ts +++ b/src/modules/transaction/reconciliation/domain/usecases/managers/batch-confirm-reconciliation.manager.ts @@ -9,22 +9,20 @@ import { TransactionEntity } from 'src/modules/transaction/transaction/domain/en import { TransactionModel } from 'src/modules/transaction/transaction/data/models/transaction.model'; import { STATUS } from 'src/core/strings/constants/base.constants'; import { TransactionChangeStatusEvent } from 'src/modules/transaction/transaction/domain/entities/event/transaction-change-status.event'; +import { generateInvoiceCodeHelper } from 'src/modules/transaction/transaction/domain/usecases/managers/helpers/generate-invoice-code.helper'; @Injectable() export class BatchConfirmReconciliationManager extends BaseBatchUpdateStatusManager { async validateData(data: TransactionEntity): Promise { - const net_profit = data.reconciliation_mdr - ? Number(this.data.payment_total) - Number(this.data.reconciliation_mdr) - : null; - Object.assign(data, { - reconciliation_mdr: this.data.reconciliation_mdr ?? null, reconciliation_confirm_by: this.user.name, reconciliation_confirm_date: new Date().getTime(), status: STATUS.SETTLED, reconciliation_status: this.dataStatus, - payment_total_net_profit: net_profit, - payment_date: this.data.payment_date, + payment_code_reference: await generateInvoiceCodeHelper( + this.dataService, + 'PMY', + ), }); return; } diff --git a/src/modules/transaction/reconciliation/domain/usecases/managers/confirm-reconciliation.manager.ts b/src/modules/transaction/reconciliation/domain/usecases/managers/confirm-reconciliation.manager.ts index 34ac9bd..bb670ca 100644 --- a/src/modules/transaction/reconciliation/domain/usecases/managers/confirm-reconciliation.manager.ts +++ b/src/modules/transaction/reconciliation/domain/usecases/managers/confirm-reconciliation.manager.ts @@ -8,6 +8,7 @@ import { import { TransactionModel } from 'src/modules/transaction/transaction/data/models/transaction.model'; import { TransactionChangeStatusEvent } from 'src/modules/transaction/transaction/domain/entities/event/transaction-change-status.event'; import { TransactionEntity } from 'src/modules/transaction/transaction/domain/entities/transaction.entity'; +import { generateInvoiceCodeHelper } from 'src/modules/transaction/transaction/domain/usecases/managers/helpers/generate-invoice-code.helper'; @Injectable() export class ConfirmReconciliationManager extends BaseUpdateStatusManager { @@ -25,6 +26,10 @@ export class ConfirmReconciliationManager extends BaseUpdateStatusManager