order-management 0.0.69 → 0.0.71
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.medusa/server/src/subscribers/order-fulfilled.js +20 -2
- package/.medusa/server/src/subscribers/order-status-change.js +14 -8
- package/.medusa/server/src/subscribers/send-order-email.js +4 -13
- package/.medusa/server/src/utils/notification-handler.js +52 -11
- package/.medusa/server/src/utils/template.js +16 -1
- package/package.json +1 -1
|
@@ -5,6 +5,7 @@ exports.getOrderIdFromFulfillment = getOrderIdFromFulfillment;
|
|
|
5
5
|
exports.default = orderFulfilledHandler;
|
|
6
6
|
const utils_1 = require("@medusajs/framework/utils");
|
|
7
7
|
const utils_2 = require("@medusajs/framework/utils");
|
|
8
|
+
const template_1 = require("../utils/template");
|
|
8
9
|
/**
|
|
9
10
|
* Resolve order_id from a fulfillment id using remote query.
|
|
10
11
|
* Tries direct fulfillment.order_id first; falls back to querying orders with fulfillments
|
|
@@ -79,8 +80,25 @@ async function orderFulfilledHandler({ event, container, }) {
|
|
|
79
80
|
logger?.info?.("[Order Fulfilled] No order_id found for delivery event; skipping order status update.");
|
|
80
81
|
return;
|
|
81
82
|
}
|
|
83
|
+
let displaySuffix = "";
|
|
84
|
+
try {
|
|
85
|
+
const query = container.resolve(utils_1.ContainerRegistrationKeys.QUERY);
|
|
86
|
+
const { data: orders = [] } = await query.graph({
|
|
87
|
+
entity: "order",
|
|
88
|
+
fields: ["id", "display_id"],
|
|
89
|
+
filters: { id: orderId },
|
|
90
|
+
});
|
|
91
|
+
const orderRow = Array.isArray(orders) ? orders[0] : orders;
|
|
92
|
+
const disp = (0, template_1.normalizeOrderDisplayId)(orderRow?.display_id);
|
|
93
|
+
if (disp !== undefined) {
|
|
94
|
+
displaySuffix = `, display_id: ${disp}`;
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
catch {
|
|
98
|
+
// Log enrichment only
|
|
99
|
+
}
|
|
82
100
|
await orderModuleService.completeOrder(orderId);
|
|
83
|
-
logger?.info?.(`[Order Fulfilled] Order ${orderId} marked as completed (fulfilled) after delivery.`);
|
|
101
|
+
logger?.info?.(`[Order Fulfilled] Order ${orderId}${displaySuffix} marked as completed (fulfilled) after delivery.`);
|
|
84
102
|
}
|
|
85
103
|
catch (error) {
|
|
86
104
|
logger?.error?.("[Order Fulfilled] Failed to complete order after delivery:", error);
|
|
@@ -96,4 +114,4 @@ exports.config = {
|
|
|
96
114
|
"fulfillment.shipment_delivered",
|
|
97
115
|
],
|
|
98
116
|
};
|
|
99
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
117
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JkZXItZnVsZmlsbGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3N1YnNjcmliZXJzL29yZGVyLWZ1bGZpbGxlZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFvQkEsOERBd0NDO0FBVUQsd0NBMERDO0FBL0hELHFEQUFrRztBQUVsRyxxREFBbUQ7QUFDbkQsZ0RBQTJEO0FBVTNEOzs7OztHQUtHO0FBQ0ksS0FBSyxVQUFVLHlCQUF5QixDQUM3QyxhQUFxQixFQUNyQixXQUFnQztJQUVoQyxJQUFJLENBQUM7UUFDSCxNQUFNLGdCQUFnQixHQUFHLElBQUEsbUNBQTJCLEVBQUM7WUFDbkQsVUFBVSxFQUFFLGFBQWE7WUFDekIsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQztZQUMxQixPQUFPLEVBQUUsRUFBRSxFQUFFLEVBQUUsQ0FBQyxhQUFhLENBQUMsRUFBRTtTQUNqQyxDQUFDLENBQUE7UUFDRixNQUFNLFlBQVksR0FBRyxNQUFNLFdBQVcsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFBO1FBQ3hELE1BQU0sSUFBSSxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUE7UUFDNUYsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQWtCLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLEtBQUssYUFBYSxDQUFzQyxDQUFBO1FBQ25ILElBQUksV0FBVyxFQUFFLFFBQVEsRUFBRSxDQUFDO1lBQzFCLE9BQU8sV0FBVyxDQUFDLFFBQVEsQ0FBQTtRQUM3QixDQUFDO1FBQ0QsMkZBQTJGO1FBQzNGLE1BQU0sVUFBVSxHQUFHLElBQUEsbUNBQTJCLEVBQUM7WUFDN0MsVUFBVSxFQUFFLE9B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
|
|
@@ -5,19 +5,23 @@ exports.default = orderStatusChangeHandler;
|
|
|
5
5
|
const utils_1 = require("@medusajs/framework/utils");
|
|
6
6
|
const notification_handler_1 = require("../utils/notification-handler");
|
|
7
7
|
const order_fulfilled_1 = require("./order-fulfilled");
|
|
8
|
+
const template_1 = require("../utils/template");
|
|
8
9
|
/**
|
|
9
|
-
* Fetch current order status when event payload only contains id (Medusa default).
|
|
10
|
+
* Fetch current order status and display id when event payload only contains id (Medusa default).
|
|
10
11
|
* order.placed, order.updated, order.completed, order.canceled emit { id } only.
|
|
11
12
|
*/
|
|
12
|
-
async function
|
|
13
|
+
async function resolveOrderFields(orderId, container) {
|
|
13
14
|
const query = container.resolve(utils_1.ContainerRegistrationKeys.QUERY);
|
|
14
15
|
const { data: orders = [] } = await query.graph({
|
|
15
16
|
entity: "order",
|
|
16
|
-
fields: ["id", "status"],
|
|
17
|
+
fields: ["id", "status", "display_id"],
|
|
17
18
|
filters: { id: orderId },
|
|
18
19
|
});
|
|
19
20
|
const order = Array.isArray(orders) ? orders[0] : orders;
|
|
20
|
-
return
|
|
21
|
+
return {
|
|
22
|
+
status: order?.status,
|
|
23
|
+
display_id: (0, template_1.normalizeOrderDisplayId)(order?.display_id),
|
|
24
|
+
};
|
|
21
25
|
}
|
|
22
26
|
/**
|
|
23
27
|
* Subscriber handler for order status change events
|
|
@@ -60,15 +64,17 @@ async function orderStatusChangeHandler({ event, container, }) {
|
|
|
60
64
|
console.error("[Order Status Change Subscriber] No order ID found in event data");
|
|
61
65
|
return;
|
|
62
66
|
}
|
|
67
|
+
const resolved = await resolveOrderFields(orderId, container);
|
|
63
68
|
// Use status from payload when present; otherwise fetch current order status (Medusa events typically send only { id })
|
|
64
69
|
if (!status) {
|
|
65
|
-
status =
|
|
70
|
+
status = resolved.status;
|
|
66
71
|
}
|
|
67
72
|
if (!status) {
|
|
68
|
-
console.error(`[Order Status Change Subscriber] Could not resolve status
|
|
73
|
+
console.error(`[Order Status Change Subscriber] Could not resolve status for order ${orderId}`);
|
|
69
74
|
return;
|
|
70
75
|
}
|
|
71
|
-
|
|
76
|
+
const displaySuffix = resolved.display_id !== undefined ? `, display_id: ${resolved.display_id}` : "";
|
|
77
|
+
console.log(`[Order Status Change Subscriber] Processing status change for order ${orderId}${displaySuffix} - status: ${status}`);
|
|
72
78
|
await (0, notification_handler_1.handleOrderStatusNotifications)(orderId, status, container);
|
|
73
79
|
}
|
|
74
80
|
catch (error) {
|
|
@@ -91,4 +97,4 @@ exports.config = {
|
|
|
91
97
|
"delivery.created", // When order is delivered
|
|
92
98
|
],
|
|
93
99
|
};
|
|
94
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
100
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JkZXItc3RhdHVzLWNoYW5nZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9zdWJzY3JpYmVycy9vcmRlci1zdGF0dXMtY2hhbmdlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQWlEQSwyQ0EwREM7QUF6R0QscURBQXFFO0FBQ3JFLHdFQUE4RTtBQUM5RSx1REFBNkQ7QUFDN0QsZ0RBQTJEO0FBUTNEOzs7R0FHRztBQUNILEtBQUssVUFBVSxrQkFBa0IsQ0FDL0IsT0FBZSxFQUNmLFNBQXdCO0lBRXhCLE1BQU0sS0FBSyxHQUFHLFNBQVMsQ0FBQyxPQUFPLENBQVEsaUNBQXlCLENBQUMsS0FBSyxDQUFDLENBQUE7SUFDdkUsTUFBTSxFQUFFLElBQUksRUFBRSxNQUFNLEdBQUcsRUFBRSxFQUFFLEdBQUcsTUFBTSxLQUFLLENBQUMsS0FBSyxDQUFDO1FBQzlDLE1BQU0sRUFBRSxPQUFPO1FBQ2YsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLFFBQVEsRUFBRSxZQUFZLENBQUM7UUFDdEMsT0FBTyxFQUFFLEVBQUUsRUFBRSxFQUFFLE9BQU8sRUFBRTtLQUN6QixDQUFDLENBQUE7SUFDRixNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQTtJQUN4RCxPQUFPO1FBQ0wsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUE0QjtRQUMzQyxVQUFVLEVBQUUsSUFBQSxrQ0FBdUIsRUFBQyxLQUFLLEVBQUUsVUFBVSxDQUFDO0tBQ3ZELENBQUE7QUFDSCxDQUFDO0FBRUQ7Ozs7Ozs7Ozs7Ozs7O0dBY0c7QUFDWSxLQUFLLFVBQVUsd0JBQXdCLENBQUMsRUFDckQsS0FBSyxFQUNMLFNBQVMsR0FDa0M7SUFDM0MsTUFBTSxJQUFJLEdBQUcsS0FBSyxDQUFDLElBQUksSUFBSSxFQUFFLENBQUE7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
|
|
@@ -47,17 +47,6 @@ function resolveCurrencyCode(order) {
|
|
|
47
47
|
}
|
|
48
48
|
return undefined;
|
|
49
49
|
}
|
|
50
|
-
function resolveOrderIdForTemplate(order, fallbackId) {
|
|
51
|
-
const display = order.display_id;
|
|
52
|
-
if (display !== null && display !== undefined && String(display).trim() !== "") {
|
|
53
|
-
return String(display);
|
|
54
|
-
}
|
|
55
|
-
const id = order.id;
|
|
56
|
-
if (typeof id === "string" && id.length > 0) {
|
|
57
|
-
return id;
|
|
58
|
-
}
|
|
59
|
-
return fallbackId;
|
|
60
|
-
}
|
|
61
50
|
/**
|
|
62
51
|
* Subscriber handler for order.placed event
|
|
63
52
|
* Sends email with order data when an order is placed (if template is configured)
|
|
@@ -144,8 +133,10 @@ async function sendOrderEmailHandler({ event: { data }, container, }) {
|
|
|
144
133
|
const claimLink = storefrontUrl
|
|
145
134
|
? `${storefrontUrl}/account/orders/claim?order_id=${orderData.id}`
|
|
146
135
|
: undefined;
|
|
136
|
+
const internalOrderId = typeof orderData.id === "string" && orderData.id.length > 0 ? orderData.id : orderId;
|
|
147
137
|
const templateData = {
|
|
148
|
-
order_id:
|
|
138
|
+
order_id: internalOrderId,
|
|
139
|
+
display_id: (0, template_1.normalizeOrderDisplayId)(orderData.display_id),
|
|
149
140
|
order_status: "confirmed",
|
|
150
141
|
order_total: orderTotal,
|
|
151
142
|
currency_code: resolveCurrencyCode(orderData),
|
|
@@ -194,4 +185,4 @@ async function sendOrderEmailHandler({ event: { data }, container, }) {
|
|
|
194
185
|
exports.config = {
|
|
195
186
|
event: "order.placed",
|
|
196
187
|
};
|
|
197
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
188
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VuZC1vcmRlci1lbWFpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9zdWJzY3JpYmVycy9zZW5kLW9yZGVyLWVtYWlsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQWtFQSx3Q0EySkM7QUE1TkQscURBQXFFO0FBRXJFLGdEQUswQjtBQUMxQixzRkFBNEU7QUFDNUUsc0NBQXlEO0FBUXpEOztHQUVHO0FBQ0gsU0FBUyxtQkFBbUIsQ0FBQyxLQUE4QjtJQUN6RCxNQUFNLE9BQU8sR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFBO0lBQzdCLElBQUksV0FBb0IsQ0FBQTtJQUN4QixJQUFJLE9BQU8sSUFBSSxPQUFPLE9BQU8sS0FBSyxRQUFRLEVBQUUsQ0FBQztRQUMzQyxNQUFNLENBQUMsR0FBRyxPQUFrQyxDQUFBO1FBQzVDLFdBQVcsR0FBRyxDQUFDLENBQUMsbUJBQW1CLElBQUksQ0FBQyxDQUFDLGdCQUFnQixDQUFBO0lBQzNELENBQUM7SUFFRCxNQUFNLEdBQUcsR0FBRyxLQUFLLENBQUMsS0FBSyxJQUFJLEtBQUssQ0FBQyxXQUFXLElBQUksV0FBVyxDQUFBO0lBQzNELElBQUksR0FBRyxLQUFLLElBQUksSUFBSSxHQUFHLEtBQUssU0FBUyxFQUFFLENBQUM7UUFDdEMsT0FBTyxLQUFLLENBQUE7SUFDZCxDQUFDO0lBQ0QsSUFBSSxPQUFPLEdBQUcsS0FBSyxRQUFRLElBQUksT0FBTyxHQUFHLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDdkQsT0FBTyxHQUFHLENBQUE7SUFDWixDQUFDO0lBQ0QsSUFBSSxPQUFPLEdBQUcsS0FBSyxRQUFRLEVBQUUsQ0FBQztRQUM1QixPQUFPLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUNwQixDQUFDO0lBQ0QsSUFBSSxPQUFPLEdBQUcsS0FBSyxRQUFRLEVBQUUsQ0FBQztRQUM1QixNQUFNLENBQUMsR0FBRyxHQUE4QixDQUFBO1FBQ3hDLElBQUksT0FBTyxDQUFD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
|
|
@@ -7,14 +7,52 @@ const send_notification_step_1 = require("../workflows/steps/send-notification-s
|
|
|
7
7
|
const config_1 = require("../config");
|
|
8
8
|
/** Max length for FCM notification body to avoid "Android message is too big" (payload limit ~4KB). */
|
|
9
9
|
const PUSH_BODY_MAX_LENGTH = 200;
|
|
10
|
+
/**
|
|
11
|
+
* Resolve a display-friendly order total across Medusa payload variants.
|
|
12
|
+
*/
|
|
13
|
+
function normalizeOrderTotal(order) {
|
|
14
|
+
const summary = order.summary;
|
|
15
|
+
let fromSummary;
|
|
16
|
+
if (summary && typeof summary === "object") {
|
|
17
|
+
const s = summary;
|
|
18
|
+
fromSummary = s.current_order_total ?? s.accounting_total;
|
|
19
|
+
}
|
|
20
|
+
const raw = order.total ?? order.grand_total ?? fromSummary;
|
|
21
|
+
if (raw === null || raw === undefined) {
|
|
22
|
+
return "N/A";
|
|
23
|
+
}
|
|
24
|
+
if (typeof raw === "number" || typeof raw === "string") {
|
|
25
|
+
return raw;
|
|
26
|
+
}
|
|
27
|
+
if (typeof raw === "bigint") {
|
|
28
|
+
return Number(raw);
|
|
29
|
+
}
|
|
30
|
+
if (typeof raw === "object") {
|
|
31
|
+
const o = raw;
|
|
32
|
+
if (typeof o.numeric === "number") {
|
|
33
|
+
return o.numeric;
|
|
34
|
+
}
|
|
35
|
+
if (typeof o.value === "number") {
|
|
36
|
+
return o.value;
|
|
37
|
+
}
|
|
38
|
+
if (typeof o.value === "string") {
|
|
39
|
+
return o.value;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
return "N/A";
|
|
43
|
+
}
|
|
10
44
|
/** Max total size for push data payload; keep only small fields to stay under FCM limit. */
|
|
11
45
|
function buildPushData(templateData, shortBody) {
|
|
12
|
-
|
|
46
|
+
const data = {
|
|
13
47
|
title: (templateData.order_status && `Order ${String(templateData.order_status)}`) || "Order Update",
|
|
14
48
|
body: shortBody,
|
|
15
49
|
order_id: templateData.order_id,
|
|
16
50
|
order_status: templateData.order_status,
|
|
17
51
|
};
|
|
52
|
+
if (templateData.display_id !== undefined && templateData.display_id !== null) {
|
|
53
|
+
data.display_id = templateData.display_id;
|
|
54
|
+
}
|
|
55
|
+
return data;
|
|
18
56
|
}
|
|
19
57
|
/**
|
|
20
58
|
* Build channel-specific payload for notification service.
|
|
@@ -107,10 +145,12 @@ function ensureSmsText(message, templateData) {
|
|
|
107
145
|
const trimmed = typeof message === "string" ? message.trim() : "";
|
|
108
146
|
if (trimmed.length > 0)
|
|
109
147
|
return trimmed;
|
|
110
|
-
const
|
|
148
|
+
const orderLabel = templateData.display_id !== undefined && templateData.display_id !== null && String(templateData.display_id).trim() !== ""
|
|
149
|
+
? String(templateData.display_id)
|
|
150
|
+
: (templateData.order_id ?? "order");
|
|
111
151
|
const status = templateData.order_status ?? "updated";
|
|
112
152
|
const total = templateData.order_total != null ? String(templateData.order_total) : "";
|
|
113
|
-
return total ? `Order ${
|
|
153
|
+
return total ? `Order ${orderLabel} is ${status}. Total: ${total}` : `Order ${orderLabel} is ${status}.`;
|
|
114
154
|
}
|
|
115
155
|
/**
|
|
116
156
|
* Build SMS payload so the provider always receives the message.
|
|
@@ -295,9 +335,12 @@ async function handleOrderStatusNotifications(orderId, newStatus, container) {
|
|
|
295
335
|
entity: "order",
|
|
296
336
|
fields: [
|
|
297
337
|
"id",
|
|
338
|
+
"display_id",
|
|
298
339
|
"status",
|
|
299
340
|
"total",
|
|
300
341
|
"grand_total",
|
|
342
|
+
"summary.current_order_total",
|
|
343
|
+
"summary.accounting_total",
|
|
301
344
|
"email",
|
|
302
345
|
"currency_code",
|
|
303
346
|
"customer_id",
|
|
@@ -315,12 +358,7 @@ async function handleOrderStatusNotifications(orderId, newStatus, container) {
|
|
|
315
358
|
return;
|
|
316
359
|
}
|
|
317
360
|
// Prepare template data
|
|
318
|
-
const totalValue = order
|
|
319
|
-
const orderTotal = typeof totalValue === "number"
|
|
320
|
-
? totalValue
|
|
321
|
-
: typeof totalValue === "string"
|
|
322
|
-
? totalValue
|
|
323
|
-
: "N/A";
|
|
361
|
+
const totalValue = normalizeOrderTotal(order);
|
|
324
362
|
// Check if the email belongs to a registered customer
|
|
325
363
|
const orderEmail = order.email;
|
|
326
364
|
const { data: customers } = orderEmail
|
|
@@ -340,8 +378,9 @@ async function handleOrderStatusNotifications(orderId, newStatus, container) {
|
|
|
340
378
|
: undefined;
|
|
341
379
|
const templateData = {
|
|
342
380
|
order_id: order.id || "N/A",
|
|
381
|
+
display_id: (0, template_1.normalizeOrderDisplayId)(order.display_id),
|
|
343
382
|
order_status: order.status || newStatus,
|
|
344
|
-
order_total:
|
|
383
|
+
order_total: totalValue,
|
|
345
384
|
currency_code,
|
|
346
385
|
order_email: order.email || "N/A",
|
|
347
386
|
order_date: (0, template_1.formatOrderDateHuman)(order.created_at ?? order.updated_at ?? new Date()),
|
|
@@ -350,6 +389,8 @@ async function handleOrderStatusNotifications(orderId, newStatus, container) {
|
|
|
350
389
|
billing_address: order.billing_address || {},
|
|
351
390
|
is_registered: isRegistered,
|
|
352
391
|
claim_link: isRegistered ? claimLink : undefined,
|
|
392
|
+
storefront_url: config.storefrontUrl,
|
|
393
|
+
storefrontUrl: config.storefrontUrl,
|
|
353
394
|
};
|
|
354
395
|
const results = [];
|
|
355
396
|
const notificationPromises = notificationConfigs.map(async (notificationConfig) => {
|
|
@@ -389,4 +430,4 @@ async function handleOrderStatusNotifications(orderId, newStatus, container) {
|
|
|
389
430
|
// Don't throw - notification errors shouldn't break order flow
|
|
390
431
|
}
|
|
391
432
|
}
|
|
392
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"notification-handler.js","sourceRoot":"","sources":["../../../../src/utils/notification-handler.ts"],"names":[],"mappings":"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"}
|
|
433
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"notification-handler.js","sourceRoot":"","sources":["../../../../src/utils/notification-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,10 +33,25 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.normalizeOrderDisplayId = normalizeOrderDisplayId;
|
|
36
37
|
exports.formatOrderDateHuman = formatOrderDateHuman;
|
|
37
38
|
exports.loadAndRenderTemplate = loadAndRenderTemplate;
|
|
38
39
|
const fs = __importStar(require("fs"));
|
|
39
40
|
const path = __importStar(require("path"));
|
|
41
|
+
/** Normalize Medusa `order.display_id` for templates and payloads. */
|
|
42
|
+
function normalizeOrderDisplayId(raw) {
|
|
43
|
+
if (raw === null || raw === undefined) {
|
|
44
|
+
return undefined;
|
|
45
|
+
}
|
|
46
|
+
if (typeof raw === "number" && !Number.isNaN(raw)) {
|
|
47
|
+
return raw;
|
|
48
|
+
}
|
|
49
|
+
if (typeof raw === "bigint") {
|
|
50
|
+
return Number(raw);
|
|
51
|
+
}
|
|
52
|
+
const s = String(raw).trim();
|
|
53
|
+
return s.length > 0 ? s : undefined;
|
|
54
|
+
}
|
|
40
55
|
/**
|
|
41
56
|
* Formats an order timestamp for email/SMS templates (e.g. "March 23, 2026 at 6:32 AM").
|
|
42
57
|
* Accepts a `Date`, ISO string, or other value Medusa returns from `created_at` / `updated_at`.
|
|
@@ -113,4 +128,4 @@ function loadAndRenderTemplate(templatePath, data) {
|
|
|
113
128
|
return null;
|
|
114
129
|
}
|
|
115
130
|
}
|
|
116
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
131
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVtcGxhdGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdXRpbHMvdGVtcGxhdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUF5QkEsMERBWUM7QUFNRCxvREFlQztBQTBCRCxzREF3Q0M7QUE1SEQsdUNBQXdCO0FBQ3hCLDJDQUE0QjtBQXVCNUIsc0VBQXNFO0FBQ3RFLFNBQWdCLHVCQUF1QixDQUFDLEdBQVk7SUFDbEQsSUFBSSxHQUFHLEtBQUssSUFBSSxJQUFJLEdBQUcsS0FBSyxTQUFTLEVBQUUsQ0FBQztRQUN0QyxPQUFPLFNBQVMsQ0FBQTtJQUNsQixDQUFDO0lBQ0QsSUFBSSxPQUFPLEdBQUcsS0FBSyxRQUFRLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUM7UUFDbEQsT0FBTyxHQUFHLENBQUE7SUFDWixDQUFDO0lBQ0QsSUFBSSxPQUFPLEdBQUcsS0FBSyxRQUFRLEVBQUUsQ0FBQztRQUM1QixPQUFPLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUNwQixDQUFDO0lBQ0QsTUFBTSxDQUFDLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFBO0lBQzVCLE9BQU8sQ0FBQyxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFBO0FBQ3JDLENBQUM7QUFFRDs7O0dBR0c7QUFDSCxTQUFnQixvQkFBb0IsQ0FBQyxLQUFjO0lBQ2pELElBQUksQ0FBbUIsQ0FBQTtJQUN2QixJQUFJLEtBQUssWUFBWSxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxPQUFPLEVBQUUsQ0FBQyxFQUFFLENBQUM7UUFDNUQsQ0FBQyxHQUFHLEtBQUssQ0FBQTtJQUNYLENBQUM7U0FBTSxJQUFJLE9B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
|