remove create payment from create order
This commit is contained in:
@@ -93,7 +93,6 @@ export class OrdersService {
|
|||||||
for (const itemData of validated.orderItemsData) {
|
for (const itemData of validated.orderItemsData) {
|
||||||
const { variant, quantity, unitPrice, discount } = itemData;
|
const { variant, quantity, unitPrice, discount } = itemData;
|
||||||
|
|
||||||
|
|
||||||
const totalPrice = (unitPrice - discount) * quantity;
|
const totalPrice = (unitPrice - discount) * quantity;
|
||||||
|
|
||||||
const orderItem = em.create(OrderItem, {
|
const orderItem = em.create(OrderItem, {
|
||||||
@@ -108,15 +107,6 @@ export class OrdersService {
|
|||||||
em.persist(orderItem);
|
em.persist(orderItem);
|
||||||
}
|
}
|
||||||
|
|
||||||
const payment = em.create(Payment, {
|
|
||||||
order,
|
|
||||||
amount: order.total,
|
|
||||||
status: PaymentStatusEnum.Pending,
|
|
||||||
method: order.paymentMethod.method,
|
|
||||||
gateway: order.paymentMethod.gateway ?? null,
|
|
||||||
});
|
|
||||||
|
|
||||||
em.persist(payment);
|
|
||||||
await em.flush();
|
await em.flush();
|
||||||
this.logger.debug(`Order ${order.id} created for user ${userId} (shop ${shopId})`);
|
this.logger.debug(`Order ${order.id} created for user ${userId} (shop ${shopId})`);
|
||||||
return order;
|
return order;
|
||||||
@@ -124,13 +114,12 @@ export class OrdersService {
|
|||||||
|
|
||||||
await this.cartService.clearCart(userId, shopId);
|
await this.cartService.clearCart(userId, shopId);
|
||||||
|
|
||||||
const { paymentUrl } = await this.paymentsService.payOrder(order.id);
|
|
||||||
this.eventEmitter.emit(
|
this.eventEmitter.emit(
|
||||||
OrderCreatedEvent.name,
|
OrderCreatedEvent.name,
|
||||||
new OrderCreatedEvent(order.id, shopId, String(order.orderNumber), order.total),
|
new OrderCreatedEvent(order.id, shopId, String(order.orderNumber), order.total),
|
||||||
);
|
);
|
||||||
|
|
||||||
return { paymentUrl, order };
|
return { order };
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user