From dc595dfb0797aa142471e70008b054fcf53a95c0 Mon Sep 17 00:00:00 2001 From: shancheas Date: Mon, 12 Aug 2024 19:34:34 +0700 Subject: [PATCH] fix: mapping transaction cancel --- .../helpers/mapping-transaction.helper.ts | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) 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 487ef24..d967d1c 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 @@ -94,7 +94,7 @@ export function mappingRevertTransaction(data, type) { editor_id: data.pos_admin?.id, editor_name: data.pos_admin?.name, edited_at: new Date(data.created_at), - payment_code: data.code, + payment_code: data.status == STATUS.CANCEL ? null : data.code, status: data.status == STATUS.CANCEL ? STATUS.PENDING : data.status, }); } else { @@ -110,7 +110,8 @@ export function mappingRevertTransaction(data, type) { id: data.booking_id ?? data._id, creator_counter_no: Number(data.pos_number), settlement_date: new Date(data.created_at), - payment_date: new Date(data.created_at), + payment_date: + data.status == STATUS.CANCEL ? null : new Date(data.created_at), invoice_date: new Date(data.created_at), payment_type: TransactionPaymentType.COUNTER, payment_type_counter: @@ -118,7 +119,8 @@ export function mappingRevertTransaction(data, type) { ? TransactionPaymentType.CC : data.payment_type, payment_card_information: data.card_information, - payment_code_reference: data.payment_code, + payment_code_reference: + data.status == STATUS.CANCEL ? null : data.payment_code, discount_code_id: data.discount_code?.id, discount_code: data.discount_code?.code, discount_percentage: data.discount_code?.discount, @@ -129,6 +131,21 @@ export function mappingRevertTransaction(data, type) { }); } + if (data.status != STATUS.CANCEL) { + Object.assign(data, { + payment_type_method_id: + data.payment_type_method?.id ?? data.payment_type_bank?.id, + payment_type_method_number: + data.payment_type_method?.account_number ?? + data.payment_type_bank?.account_number, + payment_type_method_name: + data.payment_type_method?.issuer_name ?? + data.payment_type_bank?.issuer_name, + payment_type_method_qr: + data.payment_type_method?.qr_image ?? data.payment_type_bank?.qr_image, + }); + } + Object.assign(data, { payment_total_net_profit: data.payment_total, customer_category_id: data.customer_category?.id ?? null, @@ -137,16 +154,6 @@ export function mappingRevertTransaction(data, type) { season_period_name: data.season_period?.holiday_name ?? null, season_period_type_id: data.season_period?.season_type?.id ?? null, season_period_type_name: data.season_period?.season_type?.name ?? null, - payment_type_method_id: - data.payment_type_method?.id ?? data.payment_type_bank?.id, - payment_type_method_number: - data.payment_type_method?.account_number ?? - data.payment_type_bank?.account_number, - payment_type_method_name: - data.payment_type_method?.issuer_name ?? - data.payment_type_bank?.issuer_name, - payment_type_method_qr: - data.payment_type_method?.qr_image ?? data.payment_type_bank?.qr_image, }); data.items?.map((item) => {