order-management 0.0.82 → 0.0.84
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/admin/index.js +668 -668
- package/.medusa/server/src/admin/index.mjs +669 -669
- package/.medusa/server/src/api/admin/return/[id]/reject/route.js +6 -2
- package/.medusa/server/src/api/admin/swaps/[id]/cancel/route.js +5 -1
- package/.medusa/server/src/api/admin/swaps/[id]/reject/route.js +5 -1
- package/.medusa/server/src/api/store/guest-orders/[id]/returns/route.js +56 -41
- package/.medusa/server/src/api/store/guest-orders/[id]/swaps/[swap_id]/cancel/route.js +3 -1
- package/.medusa/server/src/api/store/guest-orders/[id]/swaps/route.js +25 -15
- package/.medusa/server/src/api/store/returns/[id]/cancel/route.js +3 -1
- package/.medusa/server/src/api/store/returns/route.js +24 -19
- package/.medusa/server/src/api/store/swaps/[id]/cancel/route.js +5 -1
- package/.medusa/server/src/api/store/swaps/route.js +26 -15
- package/.medusa/server/src/helpers/index.js +2 -1
- package/.medusa/server/src/helpers/return-exchange-guard.js +129 -0
- package/.medusa/server/src/modules/order-rma-gate/constants.js +21 -0
- package/.medusa/server/src/modules/order-rma-gate/index.js +20 -0
- package/.medusa/server/src/modules/order-rma-gate/migrations/Migration20260724100000.js +34 -0
- package/.medusa/server/src/modules/order-rma-gate/models/order-rma-gate.js +11 -0
- package/.medusa/server/src/modules/order-rma-gate/service.js +202 -0
- package/.medusa/server/src/modules/order-rma-gate/stale-reclaim.js +18 -0
- package/.medusa/server/src/modules/order-rma-gate/types.js +3 -0
- package/.medusa/server/src/subscribers/order-return-received.js +45 -0
- package/.medusa/server/src/utils/notification-handler.js +13 -5
- package/.medusa/server/src/utils/phone-e164.js +66 -0
- package/README.md +13 -4
- package/package.json +4 -2
|
@@ -0,0 +1,202 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const utils_1 = require("@medusajs/framework/utils");
|
|
7
|
+
const crypto_1 = require("crypto");
|
|
8
|
+
const order_rma_gate_1 = __importDefault(require("./models/order-rma-gate"));
|
|
9
|
+
const constants_1 = require("./constants");
|
|
10
|
+
const stale_reclaim_1 = require("./stale-reclaim");
|
|
11
|
+
function isUniqueViolation(error) {
|
|
12
|
+
if (!error || typeof error !== "object") {
|
|
13
|
+
return false;
|
|
14
|
+
}
|
|
15
|
+
const e = error;
|
|
16
|
+
if (e.code === "23505") {
|
|
17
|
+
return true;
|
|
18
|
+
}
|
|
19
|
+
const msg = `${e.message ?? ""} ${e.name ?? ""}`.toLowerCase();
|
|
20
|
+
return msg.includes("unique") || msg.includes("duplicate");
|
|
21
|
+
}
|
|
22
|
+
function newGateId() {
|
|
23
|
+
return `orgate_${(0, crypto_1.randomUUID)().replace(/-/g, "")}`;
|
|
24
|
+
}
|
|
25
|
+
class OrderRmaGateModuleService extends (0, utils_1.MedusaService)({
|
|
26
|
+
OrderRmaGate: order_rma_gate_1.default,
|
|
27
|
+
}) {
|
|
28
|
+
constructor(container) {
|
|
29
|
+
super(container);
|
|
30
|
+
this.manager_ = container.manager;
|
|
31
|
+
}
|
|
32
|
+
get moduleKey() {
|
|
33
|
+
return constants_1.ORDER_RMA_GATE_MODULE;
|
|
34
|
+
}
|
|
35
|
+
normalize(raw) {
|
|
36
|
+
if (!raw || typeof raw !== "object" || !("id" in raw) || !("order_id" in raw)) {
|
|
37
|
+
throw new Error("Invalid order_rma_gate data");
|
|
38
|
+
}
|
|
39
|
+
const row = raw;
|
|
40
|
+
const kind = row.kind === "exchange" ? "exchange" : "return";
|
|
41
|
+
return {
|
|
42
|
+
id: row.id,
|
|
43
|
+
order_id: row.order_id,
|
|
44
|
+
kind,
|
|
45
|
+
reference_id: row.reference_id ?? null,
|
|
46
|
+
created_at: new Date(row.created_at ?? new Date()),
|
|
47
|
+
updated_at: new Date(row.updated_at ?? new Date()),
|
|
48
|
+
deleted_at: row.deleted_at ? new Date(row.deleted_at) : null,
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
getKnex() {
|
|
52
|
+
const manager = this.manager_;
|
|
53
|
+
if (typeof manager.getKnex !== "function") {
|
|
54
|
+
throw new utils_1.MedusaError(utils_1.MedusaError.Types.UNEXPECTED_STATE, "EntityManager.getKnex is unavailable for order_rma_gate");
|
|
55
|
+
}
|
|
56
|
+
return manager.getKnex();
|
|
57
|
+
}
|
|
58
|
+
async getActiveByOrderId(orderId) {
|
|
59
|
+
const knex = this.getKnex();
|
|
60
|
+
const row = await knex("order_rma_gate")
|
|
61
|
+
.where({ order_id: orderId })
|
|
62
|
+
.whereNull("deleted_at")
|
|
63
|
+
.first();
|
|
64
|
+
return row ? this.normalize(row) : null;
|
|
65
|
+
}
|
|
66
|
+
/**
|
|
67
|
+
* Insert a gate for the order. On unique conflict, attempt atomic stale reclaim
|
|
68
|
+
* via SELECT … FOR UPDATE in a single transaction.
|
|
69
|
+
*/
|
|
70
|
+
async acquire(orderId, kind, hasActiveMedusaRma, now = new Date()) {
|
|
71
|
+
const knex = this.getKnex();
|
|
72
|
+
const id = newGateId();
|
|
73
|
+
const stamp = now;
|
|
74
|
+
try {
|
|
75
|
+
await knex("order_rma_gate").insert({
|
|
76
|
+
id,
|
|
77
|
+
order_id: orderId,
|
|
78
|
+
kind,
|
|
79
|
+
reference_id: null,
|
|
80
|
+
created_at: stamp,
|
|
81
|
+
updated_at: stamp,
|
|
82
|
+
deleted_at: null,
|
|
83
|
+
});
|
|
84
|
+
const gate = await this.getActiveByOrderId(orderId);
|
|
85
|
+
if (!gate) {
|
|
86
|
+
throw new utils_1.MedusaError(utils_1.MedusaError.Types.UNEXPECTED_STATE, "Gate insert succeeded but row not found");
|
|
87
|
+
}
|
|
88
|
+
return { ok: true, gate };
|
|
89
|
+
}
|
|
90
|
+
catch (error) {
|
|
91
|
+
if (!isUniqueViolation(error)) {
|
|
92
|
+
throw error;
|
|
93
|
+
}
|
|
94
|
+
return this.reclaimStaleOrConflict(orderId, kind, hasActiveMedusaRma, now);
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
/**
|
|
98
|
+
* Atomic reclaim: lock existing live gate, evaluate staleness, soft-delete + insert
|
|
99
|
+
* in the same transaction so concurrent reclaimers cannot both win.
|
|
100
|
+
*/
|
|
101
|
+
async reclaimStaleOrConflict(orderId, kind, hasActiveMedusaRma, now) {
|
|
102
|
+
const knex = this.getKnex();
|
|
103
|
+
const conflictMessage = "This order already has an active return or exchange in progress. Cancel or complete the existing one before creating a new request.";
|
|
104
|
+
return knex.transaction(async (trx) => {
|
|
105
|
+
const locked = await trx("order_rma_gate")
|
|
106
|
+
.where({ order_id: orderId })
|
|
107
|
+
.whereNull("deleted_at")
|
|
108
|
+
.forUpdate()
|
|
109
|
+
.first();
|
|
110
|
+
if (!locked) {
|
|
111
|
+
// Previous holder released between unique violation and lock — insert fresh
|
|
112
|
+
const id = newGateId();
|
|
113
|
+
await trx("order_rma_gate").insert({
|
|
114
|
+
id,
|
|
115
|
+
order_id: orderId,
|
|
116
|
+
kind,
|
|
117
|
+
reference_id: null,
|
|
118
|
+
created_at: now,
|
|
119
|
+
updated_at: now,
|
|
120
|
+
deleted_at: null,
|
|
121
|
+
});
|
|
122
|
+
return {
|
|
123
|
+
ok: true,
|
|
124
|
+
gate: this.normalize({
|
|
125
|
+
id,
|
|
126
|
+
order_id: orderId,
|
|
127
|
+
kind,
|
|
128
|
+
reference_id: null,
|
|
129
|
+
created_at: now,
|
|
130
|
+
updated_at: now,
|
|
131
|
+
deleted_at: null,
|
|
132
|
+
}),
|
|
133
|
+
};
|
|
134
|
+
}
|
|
135
|
+
const existing = this.normalize(locked);
|
|
136
|
+
const medusaActive = await hasActiveMedusaRma();
|
|
137
|
+
const decision = (0, stale_reclaim_1.evaluateStaleGateReclaim)({
|
|
138
|
+
gateCreatedAt: existing.created_at,
|
|
139
|
+
referenceId: existing.reference_id,
|
|
140
|
+
hasActiveMedusaRma: medusaActive,
|
|
141
|
+
now,
|
|
142
|
+
staleTtlMs: constants_1.STALE_GATE_TTL_MS,
|
|
143
|
+
});
|
|
144
|
+
if (decision !== "reclaim") {
|
|
145
|
+
return { ok: false, message: conflictMessage, type: "NOT_ALLOWED" };
|
|
146
|
+
}
|
|
147
|
+
await trx("order_rma_gate")
|
|
148
|
+
.where({ id: existing.id })
|
|
149
|
+
.update({
|
|
150
|
+
deleted_at: now,
|
|
151
|
+
updated_at: now,
|
|
152
|
+
});
|
|
153
|
+
const newId = newGateId();
|
|
154
|
+
await trx("order_rma_gate").insert({
|
|
155
|
+
id: newId,
|
|
156
|
+
order_id: orderId,
|
|
157
|
+
kind,
|
|
158
|
+
reference_id: null,
|
|
159
|
+
created_at: now,
|
|
160
|
+
updated_at: now,
|
|
161
|
+
deleted_at: null,
|
|
162
|
+
});
|
|
163
|
+
return {
|
|
164
|
+
ok: true,
|
|
165
|
+
gate: this.normalize({
|
|
166
|
+
id: newId,
|
|
167
|
+
order_id: orderId,
|
|
168
|
+
kind,
|
|
169
|
+
reference_id: null,
|
|
170
|
+
created_at: now,
|
|
171
|
+
updated_at: now,
|
|
172
|
+
deleted_at: null,
|
|
173
|
+
}),
|
|
174
|
+
};
|
|
175
|
+
});
|
|
176
|
+
}
|
|
177
|
+
async release(orderId) {
|
|
178
|
+
const knex = this.getKnex();
|
|
179
|
+
const now = new Date();
|
|
180
|
+
await knex("order_rma_gate")
|
|
181
|
+
.where({ order_id: orderId })
|
|
182
|
+
.whereNull("deleted_at")
|
|
183
|
+
.update({
|
|
184
|
+
deleted_at: now,
|
|
185
|
+
updated_at: now,
|
|
186
|
+
});
|
|
187
|
+
}
|
|
188
|
+
async setReference(orderId, referenceId) {
|
|
189
|
+
const knex = this.getKnex();
|
|
190
|
+
const now = new Date();
|
|
191
|
+
await knex("order_rma_gate")
|
|
192
|
+
.where({ order_id: orderId })
|
|
193
|
+
.whereNull("deleted_at")
|
|
194
|
+
.update({
|
|
195
|
+
reference_id: referenceId,
|
|
196
|
+
updated_at: now,
|
|
197
|
+
});
|
|
198
|
+
return this.getActiveByOrderId(orderId);
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
exports.default = OrderRmaGateModuleService;
|
|
202
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy9tb2R1bGVzL29yZGVyLXJtYS1nYXRlL3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxxREFBc0U7QUFFdEUsbUNBQW1DO0FBQ25DLDZFQUFrRDtBQUNsRCwyQ0FJb0I7QUFFcEIsbURBR3dCO0FBd0J4QixTQUFTLGlCQUFpQixDQUFDLEtBQWM7SUFDdkMsSUFBSSxDQUFDLEtBQUssSUFBSSxPQUFPLEtBQUssS0FBSyxRQUFRLEVBQUUsQ0FBQztRQUN4QyxPQUFPLEtBQUssQ0FBQTtJQUNkLENBQUM7SUFDRCxNQUFNLENBQUMsR0FBRyxLQUEyRCxDQUFBO0lBQ3JFLElBQUksQ0FBQyxDQUFDLElBQUksS0FBSyxPQUFPLEVBQUUsQ0FBQztRQUN2QixPQUFPLElBQUksQ0FBQTtJQUNiLENBQUM7SUFDRCxNQUFNLEdBQUcsR0FBRyxHQUFHLENBQUMsQ0FBQyxPQUFPLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQyxJQUFJLElBQUksRUFBRSxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUE7SUFDOUQsT0FBTyxHQUFHLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEdBQUcsQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUE7QUFDNUQsQ0FBQztBQUVELFNBQVMsU0FBUztJQUNoQixPQUFPLFVBQVUsSUFBQSxtQkFBVSxHQUFFLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsRUFBRSxDQUFBO0FBQ25ELENBQUM7QUFFRCxNQUFxQix5QkFBMEIsU0FBUSxJQUFBLHFCQUFhLEVBQUM7SUFDbkUsWUFBWSxFQUFaLHdCQUFZO0NBQ2IsQ0FBQztJQUdBLFlBQVksU0FBK0I7UUFDekMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxDQUFBO1FBQ2hCLElBQUksQ0FBQyxRQUFRLEdBQUcsU0FBUyxDQUFDLE9BQU8sQ0FBQTtJQUNu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
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.evaluateStaleGateReclaim = evaluateStaleGateReclaim;
|
|
4
|
+
function evaluateStaleGateReclaim(input) {
|
|
5
|
+
if (input.hasActiveMedusaRma) {
|
|
6
|
+
return "conflict";
|
|
7
|
+
}
|
|
8
|
+
const ageMs = input.now.getTime() - input.gateCreatedAt.getTime();
|
|
9
|
+
if (input.referenceId == null || input.referenceId === "") {
|
|
10
|
+
if (ageMs >= input.staleTtlMs) {
|
|
11
|
+
return "reclaim";
|
|
12
|
+
}
|
|
13
|
+
return "conflict";
|
|
14
|
+
}
|
|
15
|
+
// reference_id set but Medusa reports no active RMA → orphan / terminal entity
|
|
16
|
+
return "reclaim";
|
|
17
|
+
}
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhbGUtcmVjbGFpbS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy9tb2R1bGVzL29yZGVyLXJtYS1nYXRlL3N0YWxlLXJlY2xhaW0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFhQSw0REFrQkM7QUFsQkQsU0FBZ0Isd0JBQXdCLENBQ3RDLEtBQW9DO0lBRXBDLElBQUksS0FBSyxDQUFDLGtCQUFrQixFQUFFLENBQUM7UUFDN0IsT0FBTyxVQUFVLENBQUE7SUFDbkIsQ0FBQztJQUVELE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLEdBQUcsS0FBSyxDQUFDLGFBQWEsQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUVqRSxJQUFJLEtBQUssQ0FBQyxXQUFXLElBQUksSUFBSSxJQUFJLEtBQUssQ0FBQyxXQUFXLEtBQUssRUFBRSxFQUFFLENBQUM7UUFDMUQsSUFBSSxLQUFLLElBQUksS0FBSyxDQUFDLFVBQVUsRUFBRSxDQUFDO1lBQzlCLE9BQU8sU0FBUyxDQUFBO1FBQ2xCLENBQUM7UUFDRCxPQUFPLFVBQVUsQ0FBQTtJQUNuQixDQUFDO0lBRUQsK0VBQStFO0lBQy9FLE9BQU8sU0FBUyxDQUFBO0FBQ2xCLENBQUMifQ==
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvbW9kdWxlcy9vcmRlci1ybWEtZ2F0ZS90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.config = void 0;
|
|
4
|
+
exports.default = orderReturnReceivedHandler;
|
|
5
|
+
const utils_1 = require("@medusajs/framework/utils");
|
|
6
|
+
const return_exchange_guard_1 = require("../helpers/return-exchange-guard");
|
|
7
|
+
/**
|
|
8
|
+
* Unlock the order RMA gate when a return is actually received.
|
|
9
|
+
*
|
|
10
|
+
* Note: older Medusa `createAndCompleteReturnOrderWorkflow` may emit
|
|
11
|
+
* `order.return_received` even when `receive_now` is false. We only release
|
|
12
|
+
* when the return entity status is `received`.
|
|
13
|
+
*/
|
|
14
|
+
async function orderReturnReceivedHandler({ event, container, }) {
|
|
15
|
+
const data = event.data ?? {};
|
|
16
|
+
const returnId = data.return_id ?? data.id;
|
|
17
|
+
try {
|
|
18
|
+
const orderModule = container.resolve(utils_1.Modules.ORDER);
|
|
19
|
+
let orderId = data.order_id;
|
|
20
|
+
let status;
|
|
21
|
+
if (returnId) {
|
|
22
|
+
const ret = await orderModule.retrieveReturn(returnId).catch(() => null);
|
|
23
|
+
if (!ret) {
|
|
24
|
+
return;
|
|
25
|
+
}
|
|
26
|
+
orderId = orderId ?? ret.order_id;
|
|
27
|
+
status = ret.status;
|
|
28
|
+
}
|
|
29
|
+
if (!orderId) {
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
// Only unlock on true received status (not spurious REQUESTED-time emits)
|
|
33
|
+
if (status !== "received") {
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
await (0, return_exchange_guard_1.releaseOrderRmaGate)(orderId, container);
|
|
37
|
+
}
|
|
38
|
+
catch (error) {
|
|
39
|
+
console.error(`[order.return_received] Failed to release RMA gate:`, error);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
exports.config = {
|
|
43
|
+
event: "order.return_received",
|
|
44
|
+
};
|
|
45
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JkZXItcmV0dXJuLXJlY2VpdmVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3N1YnNjcmliZXJzL29yZGVyLXJldHVybi1yZWNlaXZlZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFrQkEsNkNBcUNDO0FBdERELHFEQUFtRDtBQUVuRCw0RUFBc0U7QUFRdEU7Ozs7OztHQU1HO0FBQ1ksS0FBSyxVQUFVLDBCQUEwQixDQUFDLEVBQ3ZELEtBQUssRUFDTCxTQUFTLEdBQytCO0lBQ3hDLE1BQU0sSUFBSSxHQUFHLEtBQUssQ0FBQyxJQUFJLElBQUksRUFBRSxDQUFBO0lBQzdCLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxTQUFTLElBQUksSUFBSSxDQUFDLEVBQUUsQ0FBQTtJQUUxQyxJQUFJLENBQUM7UUFDSCxNQUFNLFdBQVcsR0FBRyxTQUFTLENBQUMsT0FBTyxDQUFzQixlQUFPLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDekUsSUFBSSxPQUFPLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQTtRQUMzQixJQUFJLE1BQTBCLENBQUE7UUFFOUIsSUFBSSxRQUFRLEVBQUUsQ0FBQztZQUNiLE1BQU0sR0FBRyxHQUFHLE1BQU0sV0FBVyxDQUFDLGNBQWMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUE7WUFDeEUsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO2dCQUNULE9BQU07WUFDUixDQUFDO1lBQ0QsT0FBTyxHQUFHLE9BQU8sSUFBSSxHQUFHLENBQUMsUUFBUSxDQUFBO1lBQ2pDLE1BQU0sR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFBO1FBQ3JCLENBQUM7UUFFRCxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7WUFDYixPQUFNO1FBQ1IsQ0FBQztRQUVELDBFQUEwRTtRQUMxRSxJQUFJLE1BQU0sS0FBSyxVQUFVLEVBQUUsQ0FBQztZQUMxQixPQUFNO1FBQ1IsQ0FBQztRQUVELE1BQU0sSUFBQSwyQ0FBbUIsRUFBQyxPQUFPLEVBQUUsU0FBUyxDQUFDLENBQUE7SUFDL0MsQ0FBQztJQUFDLE9BQU8sS0FBSyxFQUFFLENBQUM7UUFDZixPQUFPLENBQUMsS0FBSyxDQUNYLHFEQUFxRCxFQUNyRCxLQUFLLENBQ04sQ0FBQTtJQUNILENBQUM7QUFDSCxDQUFDO0FBRVksUUFBQSxNQUFNLEdBQXFCO0lBQ3RDLEtBQUssRUFBRSx1QkFBdUI7Q0FDL0IsQ0FBQSJ9
|
|
@@ -6,6 +6,7 @@ const template_1 = require("./template");
|
|
|
6
6
|
const send_notification_step_1 = require("../workflows/steps/send-notification-step");
|
|
7
7
|
const config_1 = require("../config");
|
|
8
8
|
const email_branding_1 = require("./email-branding");
|
|
9
|
+
const phone_e164_1 = require("./phone-e164");
|
|
9
10
|
/** Max length for FCM notification body to avoid "Android message is too big" (payload limit ~4KB). */
|
|
10
11
|
const PUSH_BODY_MAX_LENGTH = 200;
|
|
11
12
|
/**
|
|
@@ -174,6 +175,10 @@ function buildSmsPayload(to, text) {
|
|
|
174
175
|
* Sends payload with text in every possible field (text, body, content, data.text) so the Twilio adapter receives it.
|
|
175
176
|
*/
|
|
176
177
|
const smsChannelHandler = async (recipient, message, templateData, container) => {
|
|
178
|
+
const e164 = (0, phone_e164_1.normalizeToE164)(recipient);
|
|
179
|
+
if (!e164) {
|
|
180
|
+
throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, `SMS recipient is not a valid phone number (need E.164). Got: ${String(recipient).slice(0, 16)}`);
|
|
181
|
+
}
|
|
177
182
|
const text = ensureSmsText(message, templateData);
|
|
178
183
|
if (!text || text.length === 0) {
|
|
179
184
|
throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, "SMS text is empty after fallback; cannot send.");
|
|
@@ -182,7 +187,7 @@ const smsChannelHandler = async (recipient, message, templateData, container) =>
|
|
|
182
187
|
if (!notificationService) {
|
|
183
188
|
throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, "Notification service is not configured.");
|
|
184
189
|
}
|
|
185
|
-
const payload = buildSmsPayload(
|
|
190
|
+
const payload = buildSmsPayload(e164, text);
|
|
186
191
|
try {
|
|
187
192
|
if (typeof notificationService.create === "function") {
|
|
188
193
|
await notificationService.create(payload);
|
|
@@ -258,12 +263,15 @@ const emailRecipientResolver = (order) => {
|
|
|
258
263
|
return email && typeof email === "string" && email.includes("@") ? email : undefined;
|
|
259
264
|
};
|
|
260
265
|
/**
|
|
261
|
-
* SMS recipient resolver
|
|
266
|
+
* SMS recipient resolver — prefer shipping phone, fall back to billing.
|
|
267
|
+
* Normalize to E.164 so Twilio/MSG91 accept local Indian numbers.
|
|
262
268
|
*/
|
|
263
269
|
const smsRecipientResolver = (order) => {
|
|
264
270
|
const shippingAddress = order.shipping_address;
|
|
265
|
-
const
|
|
266
|
-
|
|
271
|
+
const billingAddress = order.billing_address;
|
|
272
|
+
const raw = shippingAddress?.phone ||
|
|
273
|
+
billingAddress?.phone;
|
|
274
|
+
return (0, phone_e164_1.normalizeToE164)(raw) ?? undefined;
|
|
267
275
|
};
|
|
268
276
|
/**
|
|
269
277
|
* Push notification recipient resolver.
|
|
@@ -421,4 +429,4 @@ async function handleOrderStatusNotifications(orderId, newStatus, container) {
|
|
|
421
429
|
// Don't throw - notification errors shouldn't break order flow
|
|
422
430
|
}
|
|
423
431
|
}
|
|
424
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"notification-handler.js","sourceRoot":"","sources":["../../../../src/utils/notification-handler.ts"],"names":[],"mappings":"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"}
|
|
432
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"notification-handler.js","sourceRoot":"","sources":["../../../../src/utils/notification-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Normalize phone numbers to E.164 for SMS providers (Twilio, MSG91, WhatsApp).
|
|
4
|
+
* Checkout addresses often store bare local numbers (e.g. 8160356061) without +country.
|
|
5
|
+
*/
|
|
6
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
+
exports.getDefaultPhoneCountryCode = getDefaultPhoneCountryCode;
|
|
8
|
+
exports.normalizeToE164 = normalizeToE164;
|
|
9
|
+
const E164_REGEX = /^\+[1-9]\d{1,14}$/;
|
|
10
|
+
function digitsOnly(value) {
|
|
11
|
+
return value.replace(/\D/g, "");
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* Default calling code without leading +. Overridable via DEFAULT_PHONE_COUNTRY_CODE.
|
|
15
|
+
*/
|
|
16
|
+
function getDefaultPhoneCountryCode() {
|
|
17
|
+
const raw = (process.env.DEFAULT_PHONE_COUNTRY_CODE || "91").trim();
|
|
18
|
+
return raw.replace(/^\+/, "") || "91";
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* Convert a stored phone string to E.164 (+…). Returns null if it cannot be normalized.
|
|
22
|
+
*/
|
|
23
|
+
function normalizeToE164(phone, defaultCountryCode = getDefaultPhoneCountryCode()) {
|
|
24
|
+
if (!phone || typeof phone !== "string") {
|
|
25
|
+
return null;
|
|
26
|
+
}
|
|
27
|
+
let trimmed = phone.trim();
|
|
28
|
+
if (!trimmed) {
|
|
29
|
+
return null;
|
|
30
|
+
}
|
|
31
|
+
// 00CC… → +CC…
|
|
32
|
+
if (trimmed.startsWith("00")) {
|
|
33
|
+
trimmed = `+${trimmed.slice(2)}`;
|
|
34
|
+
}
|
|
35
|
+
if (trimmed.startsWith("+")) {
|
|
36
|
+
const normalized = `+${digitsOnly(trimmed)}`;
|
|
37
|
+
return E164_REGEX.test(normalized) ? normalized : null;
|
|
38
|
+
}
|
|
39
|
+
let digits = digitsOnly(trimmed);
|
|
40
|
+
if (!digits) {
|
|
41
|
+
return null;
|
|
42
|
+
}
|
|
43
|
+
const cc = digitsOnly(defaultCountryCode) || "91";
|
|
44
|
+
// Leading trunk 0: 09876543210 → 9876543210
|
|
45
|
+
if (digits.startsWith("0") && digits.length === cc.length + 10 + 1) {
|
|
46
|
+
digits = digits.slice(1);
|
|
47
|
+
}
|
|
48
|
+
else if (digits.startsWith("0") && digits.length === 11 && cc === "91") {
|
|
49
|
+
digits = digits.slice(1);
|
|
50
|
+
}
|
|
51
|
+
// Already includes country code without +: 919876543210
|
|
52
|
+
if (digits.startsWith(cc) && digits.length >= cc.length + 8) {
|
|
53
|
+
const candidate = `+${digits}`;
|
|
54
|
+
return E164_REGEX.test(candidate) ? candidate : null;
|
|
55
|
+
}
|
|
56
|
+
// Bare local number — prepend default country code (IN: 10-digit mobiles)
|
|
57
|
+
if (cc === "91" && /^[6-9]\d{9}$/.test(digits)) {
|
|
58
|
+
return `+91${digits}`;
|
|
59
|
+
}
|
|
60
|
+
if (digits.length >= 8 && digits.length <= 12) {
|
|
61
|
+
const candidate = `+${cc}${digits}`;
|
|
62
|
+
return E164_REGEX.test(candidate) ? candidate : null;
|
|
63
|
+
}
|
|
64
|
+
return null;
|
|
65
|
+
}
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGhvbmUtZTE2NC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy91dGlscy9waG9uZS1lMTY0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O0dBR0c7O0FBV0gsZ0VBR0M7QUFLRCwwQ0FzREM7QUF2RUQsTUFBTSxVQUFVLEdBQUcsbUJBQW1CLENBQUE7QUFFdEMsU0FBUyxVQUFVLENBQUMsS0FBYTtJQUMvQixPQUFPLEtBQUssQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFBO0FBQ2pDLENBQUM7QUFFRDs7R0FFRztBQUNILFNBQWdCLDBCQUEwQjtJQUN4QyxNQUFNLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsMEJBQTBCLElBQUksSUFBSSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUE7SUFDbkUsT0FBTyxHQUFHLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsSUFBSSxJQUFJLENBQUE7QUFDdkMsQ0FBQztBQUVEOztHQUVHO0FBQ0gsU0FBZ0IsZUFBZSxDQUM3QixLQUFnQyxFQUNoQyxxQkFBNkIsMEJBQTBCLEVBQUU7SUFFekQsSUFBSSxDQUFDLEtBQUssSUFBSSxPQUFPLEtBQUssS0FBSyxRQUFRLEVBQUUsQ0FBQztRQUN4QyxPQUFPLElBQUksQ0FBQTtJQUNiLENBQUM7SUFFRCxJQUFJLE9BQU8sR0FBRyxLQUFLLENBQUMsSUFBSSxFQUFFLENBQUE7SUFDMUIsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2IsT0FBTyxJQUFJLENBQUE7SUFDYixDQUFDO0lBRUQsZUFBZTtJQUNmLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDO1FBQzdCLE9BQU8sR0FBRyxJQUFJLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQTtJQUNsQyxDQUFDO0lBRUQsSUFBSSxPQUFPLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUM7UUFDNUIsTUFBTSxVQUFVLEdBQUcsSUFBSSxVQUFVLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQTtRQUM1QyxPQUFPLFVBQVUsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFBO0lBQ3hELENBQUM7SUFFRCxJQUFJLE1BQU0sR0FBRyxVQUFVLENBQUMsT0FBTyxDQUFDLENBQUE7SUFDaEMsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBQ1osT0FBTyxJQUFJLENBQUE7SUFDYixDQUFDO0lBRUQsTUFBTSxFQUFFLEdBQUcsVUFBVSxDQUFDLGtCQUFrQixDQUFDLElBQUksSUFBSSxDQUFBO0lBRWpELDRDQUE0QztJQUM1QyxJQUFJLE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLElBQUksTUFBTSxDQUFDLE1BQU0sS0FBSyxFQUFFLENBQUMsTUFBTSxHQUFHLEVBQUUsR0FBRyxDQUFDLEVBQUUsQ0FBQztRQUNuRSxNQUFNLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUMxQixDQUFDO1NBQU0sSUFBSSxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxJQUFJLE1BQU0sQ0FBQyxNQUFNLEtBQUssRUFBRSxJQUFJLEVBQUUsS0FBSyxJQUFJLEVBQUUsQ0FBQztRQUN6RSxNQUFNLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUMxQixDQUFDO0lBRUQsd0RBQXdEO0lBQ3hELElBQUksTUFBTSxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUMsSUFBSSxNQUFNLENBQUMsTUFBTSxJQUFJLEVBQUUsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7UUFDNUQsTUFBTSxTQUFTLEdBQUcsSUFBSSxNQUFNLEVBQUUsQ0FBQTtRQUM5QixPQUFPLFVBQVUsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFBO0lBQ3RELENBQUM7SUFFRCwwRUFBMEU7SUFDMUUsSUFBSSxFQUFFLEtBQUssSUFBSSxJQUFJLGNBQWMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQztRQUMvQyxPQUFPLE1BQU0sTUFBTSxFQUFFLENBQUE7SUFDdkIsQ0FBQztJQUVELElBQUksTUFBTSxDQUFDLE1BQU0sSUFBSSxDQUFDLElBQUksTUFBTSxDQUFDLE1BQU0sSUFBSSxFQUFFLEVBQUUsQ0FBQztRQUM5QyxNQUFNLFNBQVMsR0FBRyxJQUFJLEVBQUUsR0FBRyxNQUFNLEVBQUUsQ0FBQTtRQUNuQyxPQUFPLFVBQVUsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFBO0lBQ3RELENBQUM7SUFFRCxPQUFPLElBQUksQ0FBQTtBQUNiLENBQUMifQ==
|
package/README.md
CHANGED
|
@@ -321,6 +321,7 @@ This plugin is compatible with Medusa v2 (e.g. `@medusajs/framework` and `@medus
|
|
|
321
321
|
- **Order Confirmation Emails**: Optional email notifications when orders are placed (with "Claim Order" support for registered users)
|
|
322
322
|
- **Status-Based Notifications**: Configurable email, SMS, and push notifications for order status changes (pending, shipped, delivered, canceled, etc.)
|
|
323
323
|
- **Return / Exchange Delivery Window**: Configurable per-type windows (`returnValidInDays`, `exchangeValidInDays`) that block return or exchange requests submitted after N days from the fulfillment's `delivered_at` timestamp. Defaults to 7 days each if not configured. The window is checked only when the order has been marked as delivered; undelivered orders are unaffected.
|
|
324
|
+
- **Return / Exchange mutual exclusion**: Order-level lock via `order_rma_gate` — an active return blocks creating an exchange (and a second return), and vice versa. Same helper on store and guest create routes. Gate uses a partial unique index on `order_id` and atomic stale reclaim (`SELECT … FOR UPDATE`). Unlock on cancel/reject or when return status is actually `received`.
|
|
324
325
|
- **Return Orders Admin Panel**: Admin UI and API for return orders (list, filter, search, detail, reject); returns are stored in the Medusa ORDER module and created via `createAndCompleteReturnOrderWorkflow`
|
|
325
326
|
- **Exchanges Admin Panel**: Admin UI and API for exchanges (list, detail, reject, cancel); exchanges are ORDER module order changes (type `exchange`) created by customers via Medusa core workflows (`beginExchangeOrderWorkflow`, etc.)
|
|
326
327
|
- **Medusa workflows**: Customer returns use `createAndCompleteReturnOrderWorkflow`; customer exchanges use `beginExchangeOrderWorkflow`, `orderExchangeRequestItemReturnWorkflow`, `orderExchangeAddNewItemWorkflow`, `confirmExchangeRequestWorkflow`, and `cancelBeginOrderExchangeWorkflow`. Admin actions use `confirmReturnReceiveWorkflow`, `cancelReturnWorkflow`, and `cancelBeginOrderExchangeWorkflow`.
|
|
@@ -334,8 +335,8 @@ This plugin is compatible with Medusa v2 (e.g. `@medusajs/framework` and `@medus
|
|
|
334
335
|
| **Store (authenticated)** | `/store/orders/cancel|reorder/:id`, `/store/returns`, `/store/swaps`, `/store/payment-details`, `/store/refund-payment-mapping/:return_id`, `/store/orders/:order_id/refund-payment-mappings` |
|
|
335
336
|
| **Store (guest)** | `/store/otp/request|verify`, `/store/guest-orders`, `/store/guest-orders/:id/returns|cancel|reorder|swaps` |
|
|
336
337
|
| **Admin** | `/admin/returns`, `/admin/swaps`, `/admin/refund-payment-mapping/:return_id`, `/admin/refund-payment-mapping/:return_id/mark-refunded`, `/admin/orders/:order_id/refund-context` |
|
|
337
|
-
| **Modules** | `payment_detail`, `refund_payment_mapping`; returns/exchanges use Medusa ORDER module |
|
|
338
|
-
| **Subscribers** | Order confirmation email, status notifications, return/swap event sync |
|
|
338
|
+
| **Modules** | `payment_detail`, `refund_payment_mapping`, `order_rma_gate`; returns/exchanges use Medusa ORDER module |
|
|
339
|
+
| **Subscribers** | Order confirmation email, status notifications, return/swap event sync, `order.return_received` RMA gate release |
|
|
339
340
|
|
|
340
341
|
### Important APIs (quick reference)
|
|
341
342
|
|
|
@@ -632,7 +633,9 @@ Status updates are tracked in the return's metadata with timestamps and admin us
|
|
|
632
633
|
|
|
633
634
|
### One active return or exchange per item (Medusa v2)
|
|
634
635
|
|
|
635
|
-
|
|
636
|
+
**Active standalone return** = `status ∈ {open, requested, partially_received}` and no `exchange_id`.
|
|
637
|
+
|
|
638
|
+
Medusa v2 does **not** allow multiple active return/exchange requests for the **same order item** at the same time. Once an item is part of a return or a swap (exchange), that quantity is reserved until the request is completed or canceled. This plugin also enforces **order-level** mutual exclusion via `order_rma_gate` (see Eligibility and Validation).
|
|
636
639
|
|
|
637
640
|
**To allow a new request**, the first one must be closed or canceled:
|
|
638
641
|
|
|
@@ -1449,7 +1452,13 @@ Returns are validated for:
|
|
|
1449
1452
|
- **Default Payment Method**: Customer must have a default payment method before creating a return
|
|
1450
1453
|
- **Delivery Window**: Return is blocked if more than `returnValidInDays` days have passed since `fulfillment.delivered_at`. If the fulfillment has no `delivered_at` the check is skipped. Configure in plugin options (default: 7 days)
|
|
1451
1454
|
- **Exchange Window**: Exchange is blocked if more than `exchangeValidInDays` days have passed since `fulfillment.delivered_at` (default: 7 days)
|
|
1452
|
-
- **
|
|
1455
|
+
- **Mutual exclusion (order-level)**: While any **active** return or exchange exists on the order, neither a second return nor a cross-type request may be created (intentional: one open RMA per order). Active return statuses are `open` | `requested` | `partially_received` (not `received` / `canceled`). Exchange-linked returns do not count as standalone refund returns. Enforced by:
|
|
1456
|
+
- Medusa entity allowlists (`assertNoActiveConflictingRma`)
|
|
1457
|
+
- `order_rma_gate` row with `UNIQUE (order_id) WHERE deleted_at IS NULL` (race-safe create)
|
|
1458
|
+
- Atomic stale reclaim with `SELECT … FOR UPDATE` when a gate is abandoned (default TTL `STALE_GATE_TTL_MS` = 15 minutes; tune if crash-recovery timing requires it)
|
|
1459
|
+
- Release on store/guest/admin cancel+reject, and on `order.return_received` only when return `status === "received"`
|
|
1460
|
+
- Create workflow failure releases the gate (compensation)
|
|
1461
|
+
- **Retry UX (v1):** a client retry of a successful create may get `400 NOT_ALLOWED` while the gate is held — check the order for an existing return/exchange before escalating support tickets
|
|
1453
1462
|
|
|
1454
1463
|
### Helper Functions
|
|
1455
1464
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "order-management",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.84",
|
|
4
4
|
"description": "A starter for Medusa plugins.",
|
|
5
5
|
"author": "Medusa (https://medusajs.com)",
|
|
6
6
|
"license": "MIT",
|
|
@@ -30,6 +30,8 @@
|
|
|
30
30
|
"scripts": {
|
|
31
31
|
"build": "medusa plugin:build",
|
|
32
32
|
"dev": "medusa plugin:develop",
|
|
33
|
+
"test": "vitest run",
|
|
34
|
+
"test:watch": "vitest",
|
|
33
35
|
"prepublishOnly": "medusa plugin:build"
|
|
34
36
|
},
|
|
35
37
|
"devDependencies": {
|
|
@@ -46,7 +48,7 @@
|
|
|
46
48
|
"@types/react": "^18.3.2",
|
|
47
49
|
"@types/react-dom": "^18.2.25",
|
|
48
50
|
"jsonwebtoken": "^9.0.3",
|
|
49
|
-
"medusa-plugin-dynamic-config": "
|
|
51
|
+
"medusa-plugin-dynamic-config": "0.0.36",
|
|
50
52
|
"prop-types": "^15.8.1",
|
|
51
53
|
"react": "^18.2.0",
|
|
52
54
|
"react-dom": "^18.2.0",
|