Skip to content

chore: fixed sernding emails for splitted orders #464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: testing
Choose a base branch
from
Open

chore: fixed sernding emails for splitted orders #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 46 additions & 40 deletions packages/modules/b2c-core/src/subscribers/notification-seller-new-order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,52 +8,58 @@ import {
export default async function sellerNewOrderHandler({
event,
container,
}: SubscriberArgs<{ id: string }>) {
}: SubscriberArgs<{ order_ids: string[] }>) {
const notificationService = container.resolve(Modules.NOTIFICATION);
const query = container.resolve(ContainerRegistrationKeys.QUERY);

const {
data: [order],
} = await query.graph({
entity: "order",
fields: [
"id",
"display_id",
"items.*",
"seller.email",
"seller.name",
"seller.id",
"customer.first_name",
"customer.last_name",
],
filters: {
id: event.data.id,
},
});
for (const orderId of event.data.order_ids) {
try {
const {
data: [order],
} = await query.graph({
entity: "order",
fields: [
"id",
"display_id",
"items.*",
"seller.email",
"seller.name",
"seller.id",
"customer.first_name",
"customer.last_name",
],
filters: {
id: orderId,
},
});

if (!order) {
console.error("Order not found:", event.data.id);
return;
}
if (!order) {
console.error("Order not found:", orderId);
continue;
}

const sellerEmail = order.seller?.email;
if (!sellerEmail) {
console.error("Seller email not found for order:", order.id);
return;
}
const sellerEmail = order.seller?.email;
if (!sellerEmail) {
console.error("Seller email not found for order:", order.id);
continue;
}

const customer_name = `${order.customer?.first_name || ""} ${order.customer?.last_name || ""}`;
await notificationService.createNotifications([
{
to: order.seller?.id,
channel: "seller_feed",
template: "seller_new_order_notification",
data: {
order_id: order.id,
customer_name,
},
},
]);
const customer_name = `${order.customer?.first_name || ""} ${order.customer?.last_name || ""}`;
await notificationService.createNotifications([
{
to: order.seller?.id,
channel: "seller_feed",
template: "seller_new_order_notification",
data: {
order_id: order.id,
customer_name,
},
},
]);
} catch (error) {
console.error(`Error processing seller notification for order ${orderId}:`, error);
}
}
}

export const config: SubscriberConfig = {
Expand Down
6 changes: 3 additions & 3 deletions packages/modules/b2c-core/src/workflows/cart/workflows/split-and-complete-cart.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,9 +351,9 @@ export const splitAndCompleteCartWorkflow = createWorkflow(

const orderEvents = transform({ createdOrders }, ({ createdOrders }) => ({
eventName: OrderWorkflowEvents.PLACED,
data: createdOrders.map((order) => ({
id: order.id,
})),
data: {
order_ids: createdOrders.map((order) => order.id),
},
}));

parallelize(
Expand Down
94 changes: 50 additions & 44 deletions packages/modules/resend/src/subscribers/notification-buyer-new-order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,57 +12,63 @@ import { Hosts, buildHostAddress } from "@mercurjs/framework";
export default async function orderCreatedHandler({
event,
container,
}: SubscriberArgs<{ id: string }>) {
}: SubscriberArgs<{ order_ids: string[] }>) {
const notificationService = container.resolve(Modules.NOTIFICATION);

const query = container.resolve(ContainerRegistrationKeys.QUERY);
const {
data: [order],
} = await query.graph({
entity: "order",
fields: [
"*",
"customer.*",
"items.*",
"shipping_address.*",
"shipping_methods.*",
"summary.*",
"order_set.*"
],
filters: {
id: event.data.id,
},
});
for (const orderId of event.data.order_ids) {
try {
const {
data: [order],
} = await query.graph({
entity: "order",
fields: [
"*",
"customer.*",
"items.*",
"shipping_address.*",
"shipping_methods.*",
"summary.*",
"order_set.*"
],
filters: {
id: orderId,
},
});

if (!order ) {
return;
}
if (!order ) {
continue;
}

const orderUrl = buildHostAddress(
Hosts.STOREFRONT,
`/user/orders/${order.order_set.id ?? order.id}`
).toString();
const orderUrl = buildHostAddress(
Hosts.STOREFRONT,
`/user/orders/${order.order_set.id ?? order.id}`
).toString();

await notificationService.createNotifications({
to: order.email,
channel: "email",
template: ResendNotificationTemplates.BUYER_NEW_ORDER,
content: {
subject: `Order Confirmation - #${order.display_id}`,
},
data: {
data: {
user_name: order.customer?.first_name || "Customer",
order_id: order.id,
order_address: orderUrl,
order: {
...order,
display_id: order.display_id,
total: order.summary?.current_order_total || 0,
await notificationService.createNotifications({
to: order.email,
channel: "email",
template: ResendNotificationTemplates.BUYER_NEW_ORDER,
content: {
subject: `Order Confirmation - #${order.display_id}`,
},
},
},
});
data: {
data: {
user_name: order.customer?.first_name || "Customer",
order_id: order.id,
order_address: orderUrl,
order: {
...order,
display_id: order.display_id,
total: order.summary?.current_order_total || 0,
},
},
},
});
} catch (error) {
console.error(`Error processing buyer notification for order ${orderId}:`, error);
}
}
}

export const config: SubscriberConfig = {
Expand Down
116 changes: 61 additions & 55 deletions packages/modules/resend/src/subscribers/notification-seller-new-order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,68 +10,74 @@ import { ResendNotificationTemplates } from "../providers/resend";
export default async function sellerNewOrderHandler({
event,
container,
}: SubscriberArgs<{ id: string }>) {
}: SubscriberArgs<{ order_ids: string[] }>) {
const notificationService = container.resolve(Modules.NOTIFICATION);
const query = container.resolve(ContainerRegistrationKeys.QUERY);

const {
data: [order],
} = await query.graph({
entity: "order",
fields: [
"id",
"display_id",
"items.*",
"seller.email",
"seller.name",
"seller.id",
"customer.first_name",
"customer.last_name",
],
filters: {
id: event.data.id,
},
});
for (const orderId of event.data.order_ids) {
try {
const {
data: [order],
} = await query.graph({
entity: "order",
fields: [
"id",
"display_id",
"items.*",
"seller.email",
"seller.name",
"seller.id",
"customer.first_name",
"customer.last_name",
],
filters: {
id: orderId,
},
});

if (!order) {
console.error("Order not found:", event.data.id);
return;
}
if (!order) {
console.error("Order not found:", orderId);
continue;
}

const sellerEmail = order.seller?.email;
if (!sellerEmail) {
console.error("Seller email not found for order:", order.id);
return;
}
const sellerEmail = order.seller?.email;
if (!sellerEmail) {
console.error("Seller email not found for order:", order.id);
continue;
}

const customer_name = `${order.customer?.first_name || ""} ${order.customer?.last_name || ""}`;
await notificationService.createNotifications([
{
to: order.seller?.id,
channel: "seller_feed",
template: "seller_new_order_notification",
data: {
order_id: order.id,
customer_name,
},
},
{
to: sellerEmail,
channel: "email",
template: ResendNotificationTemplates.SELLER_NEW_ORDER,
content: {
subject: `New order #${order.display_id} received`,
},
data: {
data: {
order_id: order.id,
order,
customer_name,
seller_name: order.seller?.name || "",
const customer_name = `${order.customer?.first_name || ""} ${order.customer?.last_name || ""}`;
await notificationService.createNotifications([
{
to: order.seller?.id,
channel: "seller_feed",
template: "seller_new_order_notification",
data: {
order_id: order.id,
customer_name,
},
},
},
},
]);
{
to: sellerEmail,
channel: "email",
template: ResendNotificationTemplates.SELLER_NEW_ORDER,
content: {
subject: `New order #${order.display_id} received`,
},
data: {
data: {
order_id: order.id,
order,
customer_name,
seller_name: order.seller?.name || "",
},
},
},
]);
} catch (error) {
console.error(`Error processing seller notification for order ${orderId}:`, error);
}
}
}

export const config: SubscriberConfig = {
Expand Down