diff --git a/src/modules/transaction/transaction/domain/usecases/managers/helpers/generate-invoice-code.helper.ts b/src/modules/transaction/transaction/domain/usecases/managers/helpers/generate-invoice-code.helper.ts index 8b25337..93b9ba3 100644 --- a/src/modules/transaction/transaction/domain/usecases/managers/helpers/generate-invoice-code.helper.ts +++ b/src/modules/transaction/transaction/domain/usecases/managers/helpers/generate-invoice-code.helper.ts @@ -9,14 +9,14 @@ export async function generateInvoiceCodeHelper(dataService) { const char = generateRandom(1); const number = generateRandom(1, true); - const invoice_code = await dataService.getOneByOptions({ + const invoice_code = await dataService.getManyByOptions({ where: { invoice_code: ILike(`%${month_year}%`), }, }); + const current_number = invoice_code.length + 1; - return `INV-${month_year}${char}${number}/${invoice_code - .count() + return `INV-${month_year}${char}${number}/${current_number .toString() .padStart(5, '0')}`; } diff --git a/src/modules/transaction/transaction/domain/usecases/managers/helpers/mapping-transaction.helper.ts b/src/modules/transaction/transaction/domain/usecases/managers/helpers/mapping-transaction.helper.ts index 8fa242f..6fc3475 100644 --- a/src/modules/transaction/transaction/domain/usecases/managers/helpers/mapping-transaction.helper.ts +++ b/src/modules/transaction/transaction/domain/usecases/managers/helpers/mapping-transaction.helper.ts @@ -81,9 +81,6 @@ export function mappingRevertTransaction(data, type) { booking_date: data.created_at, settlement_date: data.created_at, payment_type: data.payment_type, - payment_type_method_id: data.payment_type_bank?._id, - payment_type_method_name: data.payment_type_bank?.issuer_name, - payment_type_method_number: data.payment_type_bank?.account_number, payment_card_information: data.card_information, payment_code_reference: data.payment_code, discount_code_id: data.discount_code?.id, @@ -109,7 +106,7 @@ export function mappingRevertTransaction(data, type) { data.payment_type_method?.id ?? data.payment_type_bank?.id, payment_type_method_number: data.payment_type_method?.account_number ?? - data.payment_type?.account_number, + data.payment_type_bank?.account_number, payment_type_method_name: data.payment_type_method?.issuer_name ?? data.payment_type_bank?.issuer_name,