Compare commits

..

No commits in common. "4fe385bca18d2a7d36461bfc011d0779bd411153" and "88cc9f4bc3c374e09c170cc6855a9beea93d059f" have entirely different histories.

3 changed files with 72 additions and 77 deletions

View File

@ -97,9 +97,9 @@ export class ChangeStatusBookingHandler
},
relations: ['items'],
});
console.log('change status', { dataID, couchData, booking });
mappingTransaction(booking);
console.log('after mapping');
console.log('change status', { dataID, couchData, booking });
if (!couchData) {
console.log('save data to couch');

View File

@ -32,7 +32,6 @@ export class PaymentTransactionHandler
const current_data = event.data.data;
const data_id = current_data.transaction_id ?? event.data.id;
const from_refund = event.data.module == TABLE_NAME.REFUND;
console.log('payment handlet', { data_id });
const payments = await this.paymentService.getManyByOptions({
where: {

View File

@ -5,90 +5,86 @@ import {
} from 'src/modules/transaction/transaction/constants';
export function mappingTransaction(data, refundId?: string) {
try {
let payment_type_bank: any = null;
const season_period = {
id: data.season_period_id,
holiday_name: data.season_period_name,
season_type: {
id: data.season_period_type_id,
name: data.season_period_type_name,
},
};
let payment_type_bank: any = null;
const season_period = {
id: data.season_period_id,
holiday_name: data.season_period_name,
season_type: {
id: data.season_period_type_id,
name: data.season_period_type_name,
},
};
if (data.payment_type_method_id || data.payment_type_method_name) {
payment_type_bank = {
id: data.payment_type_method_id,
issuer_name: data.payment_type_method_name,
account_number: data.payment_type_method_number,
qr_image: data.payment_type_method_qr,
if (data.payment_type_method_id || data.payment_type_method_name) {
payment_type_bank = {
id: data.payment_type_method_id,
issuer_name: data.payment_type_method_name,
account_number: data.payment_type_method_number,
qr_image: data.payment_type_method_qr,
};
}
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 = {
id: itemData.item_tenant_id,
name: itemData.item_tenant_name,
share_margin: itemData.item_tenant_share_margin,
};
}
const items = data?.['items']?.map((itemData) => {
let tenant;
let refund = itemData.refunds?.find(
(item) => ![STATUS.CANCEL].includes(item.refund.status),
);
if (refundId)
refund = itemData.refunds?.find((item) => item.refund.id == refundId);
if (itemData.item_tenant_id) {
tenant = {
id: itemData.item_tenant_id,
name: itemData.item_tenant_name,
share_margin: itemData.item_tenant_share_margin,
};
}
if (refundId)
refund = itemData.refunds?.find((item) => item.refund.id == refundId);
return {
item: {
id: itemData.item_id,
name: itemData.item_name,
item_type: itemData.item_type,
base_price: itemData.item_price,
hpp: itemData.item_hpp,
tenant: tenant,
item_category: {
id: itemData.item_category_id,
name: itemData.item_category_name,
},
return {
item: {
id: itemData.item_id,
name: itemData.item_name,
item_type: itemData.item_type,
base_price: itemData.item_price,
hpp: itemData.item_hpp,
tenant: tenant,
item_category: {
id: itemData.item_category_id,
name: itemData.item_category_name,
},
id: itemData.id,
refund: refund,
qty: itemData.qty,
qty_remaining: itemData.qty_remaining,
total_price_refund: 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,
},
id: itemData.id,
refund: refund,
});
qty: itemData.qty,
qty_remaining: itemData.qty_remaining,
total_price_refund: refund?.refund_total ?? 0,
total_price: itemData.total_price,
};
});
delete data.refunds;
const refund = data.refunds?.find(
(refund) => ![STATUS.CANCEL].includes(refund.status),
);
delete data.season_period_id;
delete data.season_period_name;
delete data.season_period_type_id;
delete data.season_period_type_name;
Object.assign(data, {
season_period: season_period,
items: items,
payment_type_bank: payment_type_bank,
refund: refund,
});
delete data.payment_type_method_id;
delete data.payment_type_method_name;
delete data.payment_type_method_number;
delete data.payment_type_method_qr;
} catch (error) {
console.log('error mapping transactin', error);
}
delete data.refunds;
delete data.season_period_id;
delete data.season_period_name;
delete data.season_period_type_id;
delete data.season_period_type_name;
delete data.payment_type_method_id;
delete data.payment_type_method_name;
delete data.payment_type_method_number;
delete data.payment_type_method_qr;
}
export function mappingRevertTransaction(data, type) {