order-management 0.0.92 → 0.0.94
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 +587 -569
- package/.medusa/server/src/admin/index.mjs +588 -570
- package/.medusa/server/src/api/admin/orders/[order_id]/refund-context/route.js +134 -4
- package/.medusa/server/src/api/admin/payment-transactions/validators.js +2 -2
- package/.medusa/server/src/api/admin/refund-payment-mapping/validators.js +2 -2
- package/.medusa/server/src/api/admin/refunds/validators.js +2 -2
- package/.medusa/server/src/api/admin/return/[id]/reject/route.js +3 -3
- package/.medusa/server/src/api/admin/return/[id]/route.js +10 -5
- package/.medusa/server/src/api/admin/return/route.js +4 -10
- package/.medusa/server/src/api/admin/return/validators.js +2 -2
- package/.medusa/server/src/api/admin/swaps/validators.js +3 -3
- package/.medusa/server/src/api/store/guest-orders/[id]/cancel/route.js +15 -26
- package/.medusa/server/src/api/store/guest-orders/[id]/payment-details/route.js +161 -0
- package/.medusa/server/src/api/store/guest-orders/[id]/returns/[return_id]/refund-payment/route.js +132 -0
- package/.medusa/server/src/api/store/guest-orders/[id]/returns/route.js +132 -12
- package/.medusa/server/src/api/store/guest-orders/[id]/swaps/route.js +2 -2
- package/.medusa/server/src/api/store/orders/[order_id]/refund-payment-mappings/route.js +9 -4
- package/.medusa/server/src/api/store/orders/cancel/[order_id]/route.js +11 -17
- package/.medusa/server/src/api/store/payment-details/validators.js +63 -31
- package/.medusa/server/src/api/store/returns/[id]/route.js +16 -9
- package/.medusa/server/src/api/store/returns/route.js +39 -15
- package/.medusa/server/src/api/store/returns/validators.js +15 -3
- package/.medusa/server/src/api/store/swaps/route.js +2 -2
- package/.medusa/server/src/api/store/validators/cancel-order.js +2 -2
- package/.medusa/server/src/config.js +6 -1
- package/.medusa/server/src/helpers/resolve-return-refund-payment.js +66 -0
- package/.medusa/server/src/helpers/returns.js +140 -2
- package/.medusa/server/src/utils/fulfilled-quantity.js +52 -0
- package/.medusa/server/src/utils/unwrap-workflow-error.js +108 -0
- package/.medusa/server/src/workflows/steps/cancel-order-step.js +75 -29
- package/README.md +27 -4
- package/package.json +17 -17
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.RETURN_SHIPPING_GRAPH_FIELDS = exports.RETURN_DETAIL_GRAPH_FIELDS = exports.RETURN_LIST_GRAPH_FIELDS = void 0;
|
|
4
|
+
exports.sortReturnsByCreatedAtDesc = sortReturnsByCreatedAtDesc;
|
|
5
|
+
exports.loadReturnsViaQuery = loadReturnsViaQuery;
|
|
6
|
+
exports.loadReturnByIdViaQuery = loadReturnByIdViaQuery;
|
|
7
|
+
exports.attachReturnShippingMethods = attachReturnShippingMethods;
|
|
3
8
|
exports.checkDeliveryReturnWindow = checkDeliveryReturnWindow;
|
|
4
9
|
exports.getOrderReturnData = getOrderReturnData;
|
|
5
10
|
exports.validateReturnWindow = validateReturnWindow;
|
|
@@ -12,17 +17,150 @@ exports.enrichStoreReturnWithItemReasons = enrichStoreReturnWithItemReasons;
|
|
|
12
17
|
exports.normalizeOrderModuleReturnForDashboard = normalizeOrderModuleReturnForDashboard;
|
|
13
18
|
const utils_1 = require("@medusajs/framework/utils");
|
|
14
19
|
const DEFAULT_RETURN_EXCHANGE_WINDOW_DAYS = 7;
|
|
20
|
+
function isRecord(value) {
|
|
21
|
+
return Boolean(value && typeof value === "object" && !Array.isArray(value));
|
|
22
|
+
}
|
|
23
|
+
function graphRows(data) {
|
|
24
|
+
const rows = Array.isArray(data) ? data : data != null ? [data] : [];
|
|
25
|
+
return rows.filter(isRecord);
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* Scalar + item fields only. Do not request `shipping_methods` here:
|
|
29
|
+
* Medusa 2.21 ReturnRepository.loadShippingAdjustments throws
|
|
30
|
+
* `Cannot read properties of undefined (reading 'isInitialized')`
|
|
31
|
+
* when an `order_shipping` row has a missing nested `shipping_method`.
|
|
32
|
+
*/
|
|
33
|
+
exports.RETURN_LIST_GRAPH_FIELDS = [
|
|
34
|
+
"id",
|
|
35
|
+
"order_id",
|
|
36
|
+
"status",
|
|
37
|
+
"display_id",
|
|
38
|
+
"created_at",
|
|
39
|
+
"updated_at",
|
|
40
|
+
"canceled_at",
|
|
41
|
+
"requested_at",
|
|
42
|
+
"received_at",
|
|
43
|
+
"refund_amount",
|
|
44
|
+
"created_by",
|
|
45
|
+
"location_id",
|
|
46
|
+
"metadata",
|
|
47
|
+
"exchange_id",
|
|
48
|
+
"items.*",
|
|
49
|
+
"items.item_id",
|
|
50
|
+
"items.quantity",
|
|
51
|
+
"items.reason_id",
|
|
52
|
+
"items.note",
|
|
53
|
+
];
|
|
54
|
+
exports.RETURN_DETAIL_GRAPH_FIELDS = [
|
|
55
|
+
...exports.RETURN_LIST_GRAPH_FIELDS,
|
|
56
|
+
"items.reason.*",
|
|
57
|
+
];
|
|
58
|
+
exports.RETURN_SHIPPING_GRAPH_FIELDS = [
|
|
59
|
+
"id",
|
|
60
|
+
"shipping_methods.*",
|
|
61
|
+
"shipping_methods.amount",
|
|
62
|
+
"shipping_methods.total",
|
|
63
|
+
];
|
|
64
|
+
const RETURN_QUERY_PAGE_SIZE = 200;
|
|
65
|
+
const RETURN_QUERY_MAX = 5000;
|
|
66
|
+
function sortReturnsByCreatedAtDesc(returns) {
|
|
67
|
+
return [...returns].sort((a, b) => {
|
|
68
|
+
const aTime = new Date(String(a.created_at ?? 0)).getTime();
|
|
69
|
+
const bTime = new Date(String(b.created_at ?? 0)).getTime();
|
|
70
|
+
const aSafe = Number.isNaN(aTime) ? 0 : aTime;
|
|
71
|
+
const bSafe = Number.isNaN(bTime) ? 0 : bTime;
|
|
72
|
+
return bSafe - aSafe;
|
|
73
|
+
});
|
|
74
|
+
}
|
|
75
|
+
/**
|
|
76
|
+
* List returns via Query Graph instead of OrderModule.listAndCountReturns.
|
|
77
|
+
* Avoids the 2.21 shipping-adjustment crash on orphan shipping_method links.
|
|
78
|
+
*/
|
|
79
|
+
async function loadReturnsViaQuery(container, filters, fields = exports.RETURN_LIST_GRAPH_FIELDS) {
|
|
80
|
+
const query = container.resolve(utils_1.ContainerRegistrationKeys.QUERY);
|
|
81
|
+
const out = [];
|
|
82
|
+
let skip = 0;
|
|
83
|
+
const graphFilters = filters && Object.keys(filters).length > 0 ? filters : undefined;
|
|
84
|
+
for (;;) {
|
|
85
|
+
const result = await query.graph({
|
|
86
|
+
entity: "return",
|
|
87
|
+
fields: [...fields],
|
|
88
|
+
filters: graphFilters ?? {},
|
|
89
|
+
pagination: { skip, take: RETURN_QUERY_PAGE_SIZE },
|
|
90
|
+
});
|
|
91
|
+
const page = graphRows(result?.data);
|
|
92
|
+
out.push(...page);
|
|
93
|
+
if (page.length < RETURN_QUERY_PAGE_SIZE) {
|
|
94
|
+
break;
|
|
95
|
+
}
|
|
96
|
+
skip += RETURN_QUERY_PAGE_SIZE;
|
|
97
|
+
if (skip >= RETURN_QUERY_MAX) {
|
|
98
|
+
break;
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
return sortReturnsByCreatedAtDesc(out);
|
|
102
|
+
}
|
|
103
|
+
async function loadReturnByIdViaQuery(container, id, fields = exports.RETURN_DETAIL_GRAPH_FIELDS) {
|
|
104
|
+
const query = container.resolve(utils_1.ContainerRegistrationKeys.QUERY);
|
|
105
|
+
const result = await query
|
|
106
|
+
.graph({
|
|
107
|
+
entity: "return",
|
|
108
|
+
fields: [...fields],
|
|
109
|
+
filters: { id },
|
|
110
|
+
})
|
|
111
|
+
.catch(() => ({ data: [] }));
|
|
112
|
+
return graphRows(result?.data)[0] ?? null;
|
|
113
|
+
}
|
|
114
|
+
/**
|
|
115
|
+
* Best-effort shipping methods for refund charges. Isolated so a 2.21
|
|
116
|
+
* shipping_method hydrate failure cannot take down the returns list.
|
|
117
|
+
*/
|
|
118
|
+
async function attachReturnShippingMethods(container, returns) {
|
|
119
|
+
const ids = returns
|
|
120
|
+
.map((row) => row.id)
|
|
121
|
+
.filter((id) => typeof id === "string" && id.length > 0);
|
|
122
|
+
if (ids.length === 0) {
|
|
123
|
+
return returns;
|
|
124
|
+
}
|
|
125
|
+
const query = container.resolve(utils_1.ContainerRegistrationKeys.QUERY);
|
|
126
|
+
try {
|
|
127
|
+
const result = await query.graph({
|
|
128
|
+
entity: "return",
|
|
129
|
+
fields: [...exports.RETURN_SHIPPING_GRAPH_FIELDS],
|
|
130
|
+
filters: { id: ids },
|
|
131
|
+
});
|
|
132
|
+
const byId = new Map();
|
|
133
|
+
for (const row of graphRows(result?.data)) {
|
|
134
|
+
if (typeof row.id === "string" && Array.isArray(row.shipping_methods)) {
|
|
135
|
+
byId.set(row.id, row.shipping_methods);
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
return returns.map((row) => ({
|
|
139
|
+
...row,
|
|
140
|
+
shipping_methods: typeof row.id === "string" ? (byId.get(row.id) ?? []) : [],
|
|
141
|
+
}));
|
|
142
|
+
}
|
|
143
|
+
catch {
|
|
144
|
+
return returns.map((row) => ({
|
|
145
|
+
...row,
|
|
146
|
+
shipping_methods: Array.isArray(row.shipping_methods)
|
|
147
|
+
? row.shipping_methods
|
|
148
|
+
: [],
|
|
149
|
+
}));
|
|
150
|
+
}
|
|
151
|
+
}
|
|
15
152
|
async function checkDeliveryReturnWindow(orderId, windowDays = DEFAULT_RETURN_EXCHANGE_WINDOW_DAYS, container, requestType = "return") {
|
|
16
153
|
// Use remote query so `delivered_at` is explicitly fetched —
|
|
17
154
|
// retrieveOrder with relations does not select it by default.
|
|
18
155
|
const query = container.resolve(utils_1.ContainerRegistrationKeys.QUERY);
|
|
19
|
-
const
|
|
156
|
+
const result = await query
|
|
20
157
|
.graph({
|
|
21
158
|
entity: "order",
|
|
22
159
|
fields: ["id", "fulfillments.id", "fulfillments.delivered_at"],
|
|
23
160
|
filters: { id: orderId },
|
|
24
161
|
})
|
|
25
162
|
.catch(() => ({ data: [] }));
|
|
163
|
+
const orders = graphRows(result?.data);
|
|
26
164
|
if (!orders.length) {
|
|
27
165
|
return { allowed: true };
|
|
28
166
|
}
|
|
@@ -239,4 +377,4 @@ function normalizeOrderModuleReturnForDashboard(r) {
|
|
|
239
377
|
items,
|
|
240
378
|
};
|
|
241
379
|
}
|
|
242
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"returns.js","sourceRoot":"","sources":["../../../../src/helpers/returns.ts"],"names":[],"mappings":"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"}
|
|
380
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"returns.js","sourceRoot":"","sources":["../../../../src/helpers/returns.ts"],"names":[],"mappings":";;;AA+EA,gEAUC;AAMD,kDA8BC;AAED,wDAcC;AAMD,kEAqCC;AAED,8DA8DC;AAKD,gDA4CC;AAKD,oDASC;AAKD,sDAqBC;AAKD,gDAKC;AAKD,0CAEC;AAQD,4EA6BC;AAmBD,sEAIC;AAsCD,4EAmCC;AAED,wFAsCC;AA9gBD,qDAA8E;AAE9E,MAAM,mCAAmC,GAAG,CAAC,CAAA;AAwB7C,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAA;AAC7E,CAAC;AAED,SAAS,SAAS,CAAC,IAAa;IAC9B,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IACpE,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;AAC9B,CAAC;AAED;;;;;GAKG;AACU,QAAA,wBAAwB,GAAG;IACtC,IAAI;IACJ,UAAU;IACV,QAAQ;IACR,YAAY;IACZ,YAAY;IACZ,YAAY;IACZ,aAAa;IACb,cAAc;IACd,aAAa;IACb,eAAe;IACf,YAAY;IACZ,aAAa;IACb,UAAU;IACV,aAAa;IACb,SAAS;IACT,eAAe;IACf,gBAAgB;IAChB,iBAAiB;IACjB,YAAY;CACJ,CAAA;AAEG,QAAA,0BAA0B,GAAG;IACxC,GAAG,gCAAwB;IAC3B,gBAAgB;CACR,CAAA;AAEG,QAAA,4BAA4B,GAAG;IAC1C,IAAI;IACJ,oBAAoB;IACpB,yBAAyB;IACzB,wBAAwB;CAChB,CAAA;AAEV,MAAM,sBAAsB,GAAG,GAAG,CAAA;AAClC,MAAM,gBAAgB,GAAG,IAAI,CAAA;AAE7B,SAAgB,0BAA0B,CACxC,OAAuC;IAEvC,OAAO,CAAC,GAAG,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAChC,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAA;QAC3D,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAA;QAC3D,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;QAC7C,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;QAC7C,OAAO,KAAK,GAAG,KAAK,CAAA;IACtB,CAAC,CAAC,CAAA;AACJ,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,mBAAmB,CACvC,SAAwB,EACxB,OAAiC,EACjC,SAA4B,gCAAwB;IAEpD,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAa,iCAAyB,CAAC,KAAK,CAAC,CAAA;IAC5E,MAAM,GAAG,GAAmC,EAAE,CAAA;IAC9C,IAAI,IAAI,GAAG,CAAC,CAAA;IACZ,MAAM,YAAY,GAChB,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAA;IAElE,SAAS,CAAC;QACR,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;YAC/B,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAE,CAAC,GAAG,MAAM,CAAC;YACnB,OAAO,EAAE,YAAY,IAAI,EAAE;YAC3B,UAAU,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,sBAAsB,EAAE;SACnD,CAAC,CAAA;QACF,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QACpC,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAA;QACjB,IAAI,IAAI,CAAC,MAAM,GAAG,sBAAsB,EAAE,CAAC;YACzC,MAAK;QACP,CAAC;QACD,IAAI,IAAI,sBAAsB,CAAA;QAC9B,IAAI,IAAI,IAAI,gBAAgB,EAAE,CAAC;YAC7B,MAAK;QACP,CAAC;IACH,CAAC;IAED,OAAO,0BAA0B,CAAC,GAAG,CAAC,CAAA;AACxC,CAAC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,SAAwB,EACxB,EAAU,EACV,SAA4B,kCAA0B;IAEtD,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAa,iCAAyB,CAAC,KAAK,CAAC,CAAA;IAC5E,MAAM,MAAM,GAAG,MAAM,KAAK;SACvB,KAAK,CAAC;QACL,MAAM,EAAE,QAAQ;QAChB,MAAM,EAAE,CAAC,GAAG,MAAM,CAAC;QACnB,OAAO,EAAE,EAAE,EAAE,EAAE;KAChB,CAAC;SACD,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,CAAA;IAC9B,OAAO,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAA;AAC3C,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,2BAA2B,CAC/C,SAAwB,EACxB,OAAuC;IAEvC,MAAM,GAAG,GAAG,OAAO;SAChB,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;SACpB,MAAM,CAAC,CAAC,EAAE,EAAgB,EAAE,CAAC,OAAO,EAAE,KAAK,QAAQ,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IACxE,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrB,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAa,iCAAyB,CAAC,KAAK,CAAC,CAAA;IAC5E,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;YAC/B,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAE,CAAC,GAAG,oCAA4B,CAAC;YACzC,OAAO,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE;SACrB,CAAC,CAAA;QACF,MAAM,IAAI,GAAG,IAAI,GAAG,EAAqB,CAAA;QACzC,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC;YAC1C,IAAI,OAAO,GAAG,CAAC,EAAE,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBACtE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,gBAAgB,CAAC,CAAA;YACxC,CAAC;QACH,CAAC;QACD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC3B,GAAG,GAAG;YACN,gBAAgB,EACd,OAAO,GAAG,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE;SAC7D,CAAC,CAAC,CAAA;IACL,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC3B,GAAG,GAAG;YACN,gBAAgB,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;gBACnD,CAAC,CAAC,GAAG,CAAC,gBAAgB;gBACtB,CAAC,CAAC,EAAE;SACP,CAAC,CAAC,CAAA;IACL,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,yBAAyB,CAC7C,OAAe,EACf,aAAqB,mCAAmC,EACxD,SAAwB,EACxB,cAAqC,QAAQ;IAE7C,6DAA6D;IAC7D,8DAA8D;IAC9D,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAa,iCAAyB,CAAC,KAAK,CAAC,CAAA;IAE5E,MAAM,MAAM,GAAG,MAAM,KAAK;SACvB,KAAK,CAAC;QACL,MAAM,EAAE,OAAO;QACf,MAAM,EAAE,CAAC,IAAI,EAAE,iBAAiB,EAAE,2BAA2B,CAAC;QAC9D,OAAO,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE;KACzB,CAAC;SACD,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,CAAA;IAE9B,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACtC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACnB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;IAC1B,CAAC;IAGD,MAAM,YAAY,GAAI,MAAM,CAAC,CAAC,CAAC,CAAC,YAAiC,IAAI,EAAE,CAAA;IAEvE,IAAI,YAAY,GAAgB,IAAI,CAAA;IAEpC,KAAK,MAAM,CAAC,IAAI,YAAY,EAAE,CAAC;QAC7B,IAAI,CAAC,CAAC,YAAY,EAAE,CAAC;YACnB,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAA;YAClC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,YAAY,IAAI,CAAC,GAAG,YAAY,CAAC,EAAE,CAAC;gBACtE,YAAY,GAAG,CAAC,CAAA;YAClB,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;IAC1B,CAAC;IAED,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;IACtB,MAAM,iBAAiB,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,YAAY,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAA;IAE1F,IAAI,iBAAiB,GAAG,UAAU,EAAE,CAAC;QACnC,MAAM,KAAK,GAAG,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,UAAU,OAAO,CAAA;QAC/D,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAA;QAE/C,MAAM,OAAO,GACX,WAAW,KAAK,UAAU;YACxB,CAAC,CAAC,2EAA2E,KAAK,8CAA8C,SAAS,OAAO,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO;YACjL,CAAC,CAAC,uEAAuE,KAAK,8CAA8C,SAAS,OAAO,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO,CAAA;QAEjL,OAAO;YACL,OAAO,EAAE,KAAK;YACd,OAAO;YACP,YAAY,EAAE,YAAY,CAAC,WAAW,EAAE;YACxC,WAAW,EAAE,UAAU;SACxB,CAAA;IACH,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;AAC1B,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,kBAAkB,CACtC,OAAe,EACf,SAAwB;IAOxB,MAAM,kBAAkB,GACtB,SAAS,CAAC,OAAO,CAAsB,eAAO,CAAC,KAAK,CAAC,CAAA;IAEvD,wDAAwD;IACxD,MAAM,KAAK,GAAG,MAAM,kBAAkB,CAAC,aAAa,CAAC,OAAO,EAAE;QAC5D,SAAS,EAAE,CAAC,kBAAkB,EAAE,cAAc,CAAC;KAChD,CAAC,CAAA;IAEF,MAAM,SAAS,GAAG,KAUjB,CAAA;IAED,sCAAsC;IACtC,MAAM,UAAU,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,CAAA;IAE3D,0BAA0B;IAC1B,MAAM,eAAe,GAAG,SAAS,CAAC,gBAAgB,IAAI,EAAE,CAAA;IACxD,MAAM,oBAAoB,GACxB,eAAe,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,EAAE,CAAA;IACjD,MAAM,wBAAwB,GAAG,eAAe,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;IAEvD,OAAO;QACL,QAAQ,EAAE,OAAO;QACjB,WAAW,EAAE,UAAU;QACvB,uBAAuB,EAAE,oBAAoB;QAC7C,2BAA2B,EAAE,wBAAwB;KACtD,CAAA;AACH,CAAC;AAED;;GAEG;AACH,SAAgB,oBAAoB,CAClC,cAAoB,EACpB,aAAqB,EAAE;IAEvB,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;IACtB,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAC/B,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,cAAc,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CACnE,CAAA;IACD,OAAO,cAAc,IAAI,UAAU,CAAA;AACrC,CAAC;AAED;;GAEG;AACH,SAAgB,qBAAqB,CACnC,WAGE,EACF,UAIE;IAEF,IAAI,YAAY,GAAG,CAAC,CAAA;IAEpB,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,UAAU,CAAC,EAAE,CAAC,CAAA;QACtE,IAAI,SAAS,EAAE,CAAC;YACd,YAAY,IAAI,SAAS,CAAC,UAAU,GAAG,UAAU,CAAC,QAAQ,CAAA;QAC5D,CAAC;IACH,CAAC;IAED,OAAO,YAAY,CAAA;AACrB,CAAC;AAED;;GAEG;AACH,SAAgB,kBAAkB,CAChC,MAAc,EACd,eAAuB,KAAK;IAE5B,OAAO,GAAG,YAAY,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAA;AACvD,CAAC;AAED;;GAEG;AACH,SAAgB,eAAe,CAAC,MAAc;IAC5C,OAAO,MAAM,KAAK,WAAW,CAAA;AAC/B,CAAC;AAED;;;;;GAKG;AACH,SAAgB,gCAAgC,CAAC,WAAoB;IAOnE,IAAI,CAAC,WAAW;QAAE,OAAO,EAAE,CAAA;IAC3B,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QAC/B,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,IAAgG,EAAE,EAAE;YAC1H,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAA;YAChD,OAAO;gBACL,EAAE;gBACF,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE;gBACjD,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC;gBACpC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;gBACrD,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS;aAClE,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;QACpC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAY,CAAA;YACjD,OAAO,gCAAgC,CAAC,MAAM,CAAC,CAAA;QACjD,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,EAAE,CAAA;QACX,CAAC;IACH,CAAC;IACD,OAAO,EAAE,CAAA;AACX,CAAC;AAED;;;;GAIG;AACH,SAAS,iBAAiB,CAAC,KAAgD;IACzE,IAAI,KAAK,IAAI,IAAI;QAAE,OAAO,SAAS,CAAA;IACnC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE;QAAE,OAAO,SAAS,CAAA;IACtE,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAA;IAC5B,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAAE,OAAO,SAAS,CAAA;IAClD,OAAO,IAAI,CAAC,WAAW,EAAE,CAAA;AAC3B,CAAC;AAED;;;GAGG;AACH,SAAgB,6BAA6B,CAAoC,CAAI;IACnF,MAAM,UAAU,GAAG,iBAAiB,CAAC,CAAC,CAAC,UAAuC,CAAC,IAAI,iBAAiB,CAAC,CAAC,CAAC,YAAyC,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;IAC7K,MAAM,YAAY,GAAG,iBAAiB,CAAC,CAAC,CAAC,YAAyC,CAAC,CAAA;IACnF,OAAO,EAAE,GAAG,CAAC,EAAE,UAAU,EAAE,GAAG,CAAC,YAAY,IAAI,EAAE,YAAY,EAAE,CAAC,EAAuD,CAAA;AACzH,CAAC;AAeD,SAAS,aAAa,CAAC,CAAU;IAC/B,OAAO,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;AACjE,CAAC;AAED,SAAS,0BAA0B,CAAC,MAAe;IACjD,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,OAAO,MAAM,CAAC,EAAE,KAAK,QAAQ,EAAE,CAAC;QAC5D,OAAO,IAAI,CAAA;IACb,CAAC;IACD,OAAO;QACL,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,KAAK,EAAE,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;QAC3D,KAAK,EAAE,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;QAC3D,WAAW,EACT,MAAM,CAAC,WAAW,KAAK,IAAI,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS;YAC7D,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC;KACjC,CAAA;AACH,CAAC;AAED;;;GAGG;AACH,SAAgB,gCAAgC,CAAoC,GAAM;IACxF,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC;QACvC,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;YAC/B,CAAC,CAAC,cAAc;YAChB,CAAC,CAAC,IAAI,CAAA;IACV,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAc,CAAA;IAC3C,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;QACxC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,CAAC;YAC/B,OAAO,UAAU,CAAA;QACnB,CAAC;QACD,MAAM,OAAO,GAAG,0BAA0B,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QAC7D,MAAM,WAAW,GAAG,UAAU,CAAC,SAAS,CAAA;QACxC,MAAM,SAAS,GACb,WAAW,KAAK,SAAS,IAAI,WAAW,KAAK,IAAI;YAC/C,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC;YACrB,CAAC,CAAC,OAAO,EAAE,EAAE,IAAI,IAAI,CAAA;QACzB,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,GAAG,UAAU,CAAA;QACnD,MAAM,IAAI,GACR,UAAU,CAAC,IAAI,KAAK,SAAS,IAAI,UAAU,CAAC,IAAI,KAAK,IAAI;YACvD,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QAC7B,OAAO;YACL,GAAG,IAAI;YACP,SAAS;YACT,aAAa,EAAE,OAAO;YACtB,IAAI;SACL,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,EAAE,GAAG,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAO,CAAA;AAC3C,CAAC;AAED,SAAgB,sCAAsC,CAAC,CAUtD;IAWC,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC3C,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;QACzC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC;QAC9C,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC;KACrC,CAAC,CAAC,CAAA;IACH,MAAM,UAAU,GAAG,iBAAiB,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,YAAY,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;IAChG,OAAO;QACL,EAAE,EAAE,CAAC,CAAC,EAAE;QACR,QAAQ,EAAE,CAAC,CAAC,QAAQ;QACpB,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,WAAW;QAC/B,UAAU;QACV,WAAW,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS;QAC9E,YAAY,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS;QACjF,WAAW,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS;QAC9E,aAAa,EAAE,CAAC,CAAC,aAAa,IAAI,IAAI;QACtC,KAAK;KACN,CAAA;AACH,CAAC"}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.parseFulfilledQuantity = parseFulfilledQuantity;
|
|
4
|
+
exports.getItemFulfilledQuantity = getItemFulfilledQuantity;
|
|
5
|
+
/**
|
|
6
|
+
* Parse Medusa BigNumber / detail fulfilled quantity fields into a non-negative integer.
|
|
7
|
+
* Returns 0 when the value is missing or unparsable (never throws).
|
|
8
|
+
*/
|
|
9
|
+
function parseFulfilledQuantity(value) {
|
|
10
|
+
if (value == null) {
|
|
11
|
+
return 0;
|
|
12
|
+
}
|
|
13
|
+
if (typeof value === "number") {
|
|
14
|
+
return Number.isFinite(value) && value > 0 ? Math.floor(value) : 0;
|
|
15
|
+
}
|
|
16
|
+
if (typeof value === "string") {
|
|
17
|
+
const trimmed = value.trim();
|
|
18
|
+
if (!trimmed) {
|
|
19
|
+
return 0;
|
|
20
|
+
}
|
|
21
|
+
const parsed = Number(trimmed);
|
|
22
|
+
return Number.isFinite(parsed) && parsed > 0 ? Math.floor(parsed) : 0;
|
|
23
|
+
}
|
|
24
|
+
if (typeof value === "object") {
|
|
25
|
+
const record = value;
|
|
26
|
+
if ("value" in record) {
|
|
27
|
+
return parseFulfilledQuantity(record.value);
|
|
28
|
+
}
|
|
29
|
+
if ("numeric" in record) {
|
|
30
|
+
return parseFulfilledQuantity(record.numeric);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
return 0;
|
|
34
|
+
}
|
|
35
|
+
function getItemFulfilledQuantity(item) {
|
|
36
|
+
const detail = item.detail != null && typeof item.detail === "object"
|
|
37
|
+
? item.detail
|
|
38
|
+
: undefined;
|
|
39
|
+
const candidates = [
|
|
40
|
+
item.fulfilled_quantity,
|
|
41
|
+
detail?.fulfilled_quantity,
|
|
42
|
+
detail?.raw_fulfilled_quantity,
|
|
43
|
+
];
|
|
44
|
+
for (const candidate of candidates) {
|
|
45
|
+
const qty = parseFulfilledQuantity(candidate);
|
|
46
|
+
if (qty > 0) {
|
|
47
|
+
return qty;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
return 0;
|
|
51
|
+
}
|
|
52
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnVsZmlsbGVkLXF1YW50aXR5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3V0aWxzL2Z1bGZpbGxlZC1xdWFudGl0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUlBLHdEQTZCQztBQUVELDREQXVCQztBQTFERDs7O0dBR0c7QUFDSCxTQUFnQixzQkFBc0IsQ0FBQyxLQUFjO0lBQ25ELElBQUksS0FBSyxJQUFJLElBQUksRUFBRSxDQUFDO1FBQ2xCLE9BQU8sQ0FBQyxDQUFBO0lBQ1YsQ0FBQztJQUVELElBQUksT0FBTyxLQUFLLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDOUIsT0FBTyxNQUFNLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxJQUFJLEtBQUssR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUNwRSxDQUFDO0lBRUQsSUFBSSxPQUFPLEtBQUssS0FBSyxRQUFRLEVBQUUsQ0FBQztRQUM5QixNQUFNLE9BQU8sR0FBRyxLQUFLLENBQUMsSUFBSSxFQUFFLENBQUE7UUFDNUIsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ2IsT0FBTyxDQUFDLENBQUE7UUFDVixDQUFDO1FBQ0QsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFBO1FBQzlCLE9BQU8sTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsSUFBSSxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDdkUsQ0FBQztJQUVELElBQUksT0FBTyxLQUFLLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDOUIsTUFBTSxNQUFNLEdBQUcsS0FBZ0MsQ0FBQTtRQUMvQyxJQUFJLE9BQU8sSUFBSSxNQUFNLEVBQUUsQ0FBQztZQUN0QixPQUFPLHNCQUFzQixDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUM3QyxDQUFDO1FBQ0QsSUFBSSxTQUFTLElBQUksTUFBTSxFQUFFLENBQUM7WUFDeEIsT0FBTyxzQkFBc0IsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUE7UUFDL0MsQ0FBQztJQUNILENBQUM7SUFFRCxPQUFPLENBQUMsQ0FBQTtBQUNWLENBQUM7QUFFRCxTQUFnQix3QkFBd0IsQ0FBQyxJQUd4QztJQUNDLE1BQU0sTUFBTSxHQUNWLElBQUksQ0FBQyxNQUFNLElBQUksSUFBSSxJQUFJLE9BQU8sSUFBSSxDQUFDLE1BQU0sS0FBSyxRQUFRO1FBQ3BELENBQUMsQ0FBRSxJQUFJLENBQUMsTUFBa0M7UUFDMUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQTtJQUVmLE1BQU0sVUFBVSxHQUFjO1FBQzVCLElBQUksQ0FBQyxrQkFBa0I7UUFDdkIsTUFBTSxFQUFFLGtCQUFrQjtRQUMxQixNQUFNLEVBQUUsc0JBQXNCO0tBQy9CLENBQUE7SUFFRCxLQUFLLE1BQU0sU0FBUyxJQUFJLFVBQVUsRUFBRSxDQUFDO1FBQ25DLE1BQU0sR0FBRyxHQUFHLHNCQUFzQixDQUFDLFNBQVMsQ0FBQyxDQUFBO1FBQzdDLElBQUksR0FBRyxHQUFHLENBQUMsRUFBRSxDQUFDO1lBQ1osT0FBTyxHQUFHLENBQUE7UUFDWixDQUFDO0lBQ0gsQ0FBQztJQUVELE9BQU8sQ0FBQyxDQUFBO0FBQ1YsQ0FBQyJ9
|
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.unwrapWorkflowError = unwrapWorkflowError;
|
|
4
|
+
exports.statusCodeForMedusaErrorType = statusCodeForMedusaErrorType;
|
|
5
|
+
const utils_1 = require("@medusajs/framework/utils");
|
|
6
|
+
function isRecord(value) {
|
|
7
|
+
return typeof value === "object" && value !== null;
|
|
8
|
+
}
|
|
9
|
+
function readString(value) {
|
|
10
|
+
return typeof value === "string" && value.trim() !== "" ? value.trim() : undefined;
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* Medusa workflow `.run()` often wraps the real failure in nested objects
|
|
14
|
+
* (`error`, `cause`, `errors[]`) that are not `instanceof Error` / `MedusaError`.
|
|
15
|
+
* Dig until we find a usable message and Medusa-like type.
|
|
16
|
+
*/
|
|
17
|
+
function unwrapWorkflowError(error) {
|
|
18
|
+
const visited = new Set();
|
|
19
|
+
const queue = [error];
|
|
20
|
+
let bestMessage;
|
|
21
|
+
let bestType;
|
|
22
|
+
let sawMedusa = false;
|
|
23
|
+
while (queue.length > 0) {
|
|
24
|
+
const current = queue.shift();
|
|
25
|
+
if (current == null || visited.has(current)) {
|
|
26
|
+
continue;
|
|
27
|
+
}
|
|
28
|
+
visited.add(current);
|
|
29
|
+
if (typeof current === "string") {
|
|
30
|
+
if (!bestMessage) {
|
|
31
|
+
bestMessage = current;
|
|
32
|
+
}
|
|
33
|
+
continue;
|
|
34
|
+
}
|
|
35
|
+
if (current instanceof utils_1.MedusaError) {
|
|
36
|
+
sawMedusa = true;
|
|
37
|
+
bestMessage = current.message || bestMessage;
|
|
38
|
+
bestType = current.type || bestType;
|
|
39
|
+
continue;
|
|
40
|
+
}
|
|
41
|
+
if (current instanceof Error) {
|
|
42
|
+
// Prefer nested Error messages (often the real provider failure).
|
|
43
|
+
if (current.message) {
|
|
44
|
+
bestMessage = current.message;
|
|
45
|
+
}
|
|
46
|
+
const maybeType = current.type;
|
|
47
|
+
if (typeof maybeType === "string") {
|
|
48
|
+
bestType = maybeType;
|
|
49
|
+
}
|
|
50
|
+
if (current.__isMedusaError === true) {
|
|
51
|
+
sawMedusa = true;
|
|
52
|
+
}
|
|
53
|
+
const cause = current.cause;
|
|
54
|
+
if (cause != null) {
|
|
55
|
+
queue.push(cause);
|
|
56
|
+
}
|
|
57
|
+
continue;
|
|
58
|
+
}
|
|
59
|
+
if (!isRecord(current)) {
|
|
60
|
+
continue;
|
|
61
|
+
}
|
|
62
|
+
const like = current;
|
|
63
|
+
if (like.__isMedusaError === true || like.name === "MedusaError") {
|
|
64
|
+
sawMedusa = true;
|
|
65
|
+
}
|
|
66
|
+
const message = readString(like.message) ||
|
|
67
|
+
readString(current["msg"]) ||
|
|
68
|
+
readString(current["detail"]);
|
|
69
|
+
if (message && !bestMessage) {
|
|
70
|
+
bestMessage = message;
|
|
71
|
+
}
|
|
72
|
+
if (typeof like.type === "string" && !bestType) {
|
|
73
|
+
bestType = like.type;
|
|
74
|
+
}
|
|
75
|
+
if (like.error != null) {
|
|
76
|
+
queue.push(like.error);
|
|
77
|
+
}
|
|
78
|
+
if (like.cause != null) {
|
|
79
|
+
queue.push(like.cause);
|
|
80
|
+
}
|
|
81
|
+
if (Array.isArray(like.errors)) {
|
|
82
|
+
for (const nested of like.errors) {
|
|
83
|
+
queue.push(nested);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
return {
|
|
88
|
+
message: bestMessage || "An error occurred",
|
|
89
|
+
type: bestType,
|
|
90
|
+
isMedusaError: sawMedusa || Boolean(bestType),
|
|
91
|
+
};
|
|
92
|
+
}
|
|
93
|
+
function statusCodeForMedusaErrorType(type) {
|
|
94
|
+
switch (type) {
|
|
95
|
+
case utils_1.MedusaError.Types.NOT_FOUND:
|
|
96
|
+
return 404;
|
|
97
|
+
case utils_1.MedusaError.Types.NOT_ALLOWED:
|
|
98
|
+
return 403;
|
|
99
|
+
case utils_1.MedusaError.Types.UNAUTHORIZED:
|
|
100
|
+
return 401;
|
|
101
|
+
case utils_1.MedusaError.Types.INVALID_DATA:
|
|
102
|
+
case utils_1.MedusaError.Types.INVALID_ARGUMENT:
|
|
103
|
+
return 400;
|
|
104
|
+
default:
|
|
105
|
+
return 400;
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidW53cmFwLXdvcmtmbG93LWVycm9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3V0aWxzL3Vud3JhcC13b3JrZmxvdy1lcnJvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQWdDQSxrREFzRkM7QUFFRCxvRUFjQztBQXRJRCxxREFBdUQ7QUFtQnZELFNBQVMsUUFBUSxDQUFDLEtBQWM7SUFDOUIsT0FBTyxPQUFPLEtBQUssS0FBSyxRQUFRLElBQUksS0FBSyxLQUFLLElBQUksQ0FBQTtBQUNwRCxDQUFDO0FBRUQsU0FBUyxVQUFVLENBQUMsS0FBYztJQUNoQyxPQUFPLE9BQU8sS0FBSyxLQUFLLFFBQVEsSUFBSSxLQUFLLENBQUMsSUFBSSxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQTtBQUNwRixDQUFDO0FBRUQ7Ozs7R0FJRztBQUNILFNBQWdCLG1CQUFtQixDQUFDLEtBQWM7SUFDaEQsTUFBTSxPQUFPLEdBQUcsSUFBSSxHQUFHLEVBQVcsQ0FBQTtJQUNsQyxNQUFNLEtBQUssR0FBYyxDQUFDLEtBQUssQ0FBQyxDQUFBO0lBRWhDLElBQUksV0FBK0IsQ0FBQTtJQUNuQyxJQUFJLFFBQTRCLENBQUE7SUFDaEMsSUFBSSxTQUFTLEdBQUcsS0FBSyxDQUFBO0lBRXJCLE9BQU8sS0FBSyxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsQ0FBQztRQUN4QixNQUFNLE9BQU8sR0FBRyxLQUFLLENBQUMsS0FBSyxFQUFFLENBQUE7UUFDN0IsSUFBSSxPQUFPLElBQUksSUFBSSxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztZQUM1QyxTQUFRO1FBQ1YsQ0FBQztRQUNELE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUE7UUFFcEIsSUFBSSxPQUFPLE9BQU8sS0FBSyxRQUFRLEVBQUUs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
|
|
@@ -1,59 +1,105 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.cancelOrderStep = void 0;
|
|
4
|
+
exports.cancelOpenUnshippedFulfillments = cancelOpenUnshippedFulfillments;
|
|
5
|
+
exports.executeCancelOrder = executeCancelOrder;
|
|
4
6
|
const utils_1 = require("@medusajs/framework/utils");
|
|
5
7
|
const workflows_sdk_1 = require("@medusajs/framework/workflows-sdk");
|
|
6
8
|
const core_flows_1 = require("@medusajs/medusa/core-flows");
|
|
7
|
-
|
|
9
|
+
const fulfilled_quantity_1 = require("../../utils/fulfilled-quantity");
|
|
10
|
+
const unwrap_workflow_error_1 = require("../../utils/unwrap-workflow-error");
|
|
11
|
+
/**
|
|
12
|
+
* Cancel unshipped open fulfillments so Medusa core cancelOrderWorkflow can proceed.
|
|
13
|
+
* Shipped fulfillments cannot be canceled — those block order cancel intentionally.
|
|
14
|
+
*/
|
|
15
|
+
async function cancelOpenUnshippedFulfillments(container, orderId, cancelFulfillment) {
|
|
16
|
+
let query;
|
|
17
|
+
try {
|
|
18
|
+
query = container.resolve(utils_1.ContainerRegistrationKeys.QUERY);
|
|
19
|
+
}
|
|
20
|
+
catch {
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
const { data } = await query.graph({
|
|
24
|
+
entity: "order",
|
|
25
|
+
fields: ["id", "fulfillments.id", "fulfillments.canceled_at", "fulfillments.shipped_at"],
|
|
26
|
+
filters: { id: orderId },
|
|
27
|
+
});
|
|
28
|
+
const orderRow = data?.[0];
|
|
29
|
+
const fulfillments = (orderRow?.fulfillments ?? []);
|
|
30
|
+
const open = fulfillments.filter((f) => f?.id && !f.canceled_at);
|
|
31
|
+
if (open.length === 0) {
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
const shipped = open.filter((f) => Boolean(f.shipped_at));
|
|
35
|
+
if (shipped.length > 0) {
|
|
36
|
+
throw new utils_1.MedusaError(utils_1.MedusaError.Types.NOT_ALLOWED, "Cannot cancel order: Some items have already been fulfilled or shipped");
|
|
37
|
+
}
|
|
38
|
+
for (const fulfillment of open) {
|
|
39
|
+
await cancelFulfillment({
|
|
40
|
+
order_id: orderId,
|
|
41
|
+
fulfillment_id: fulfillment.id,
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
async function executeCancelOrder(input, container, deps) {
|
|
8
46
|
const { order } = input;
|
|
9
47
|
if (!order || !order.id) {
|
|
10
48
|
throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, "Order is required to cancel");
|
|
11
49
|
}
|
|
12
|
-
// Check if order has fulfilled items
|
|
13
|
-
// Check order items' fulfilled_quantity directly from the order data
|
|
14
50
|
const orderItems = order.items || [];
|
|
15
|
-
const hasFulfilledItems = orderItems.some((item) => {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
// Check fulfilled_quantity from detail.raw_fulfilled_quantity or direct field
|
|
20
|
-
const fulfilledQty = detail?.raw_fulfilled_quantity?.value
|
|
21
|
-
? parseInt(detail.raw_fulfilled_quantity.value, 10)
|
|
22
|
-
: fulfilledQuantity || 0;
|
|
23
|
-
return fulfilledQty > 0;
|
|
24
|
-
});
|
|
51
|
+
const hasFulfilledItems = orderItems.some((item) => (0, fulfilled_quantity_1.getItemFulfilledQuantity)({
|
|
52
|
+
fulfilled_quantity: item.fulfilled_quantity,
|
|
53
|
+
detail: item.detail,
|
|
54
|
+
}) > 0);
|
|
25
55
|
if (hasFulfilledItems) {
|
|
26
56
|
throw new utils_1.MedusaError(utils_1.MedusaError.Types.NOT_ALLOWED, "Cannot cancel order: Some items have already been fulfilled");
|
|
27
57
|
}
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
58
|
+
const cancelFulfillment = deps?.cancelFulfillment ??
|
|
59
|
+
(async (fulfillmentInput) => {
|
|
60
|
+
await (0, core_flows_1.cancelOrderFulfillmentWorkflow)(container).run({
|
|
61
|
+
input: fulfillmentInput,
|
|
62
|
+
});
|
|
63
|
+
});
|
|
64
|
+
const cancelOrder = deps?.cancelOrder ??
|
|
65
|
+
(async (cancelInput) => {
|
|
66
|
+
const { result } = await (0, core_flows_1.cancelOrderWorkflow)(container).run({
|
|
67
|
+
input: cancelInput,
|
|
68
|
+
});
|
|
69
|
+
return result;
|
|
34
70
|
});
|
|
35
|
-
|
|
71
|
+
try {
|
|
72
|
+
await cancelOpenUnshippedFulfillments(container, order.id, cancelFulfillment);
|
|
73
|
+
const result = await cancelOrder({ order_id: order.id });
|
|
36
74
|
const workflowResult = result;
|
|
37
|
-
// Extract order ID and status from result (may be nested or direct)
|
|
38
75
|
const canceledOrderId = workflowResult?.order?.id || workflowResult?.id || order.id;
|
|
39
76
|
const canceledStatus = workflowResult?.order?.status || workflowResult?.status || "canceled";
|
|
40
|
-
return
|
|
77
|
+
return {
|
|
41
78
|
order_id: canceledOrderId,
|
|
42
79
|
status: canceledStatus,
|
|
43
80
|
message: "Order canceled successfully",
|
|
44
|
-
}
|
|
81
|
+
};
|
|
45
82
|
}
|
|
46
83
|
catch (error) {
|
|
47
|
-
// Handle cancellation errors
|
|
48
84
|
if (error instanceof utils_1.MedusaError) {
|
|
49
85
|
throw error;
|
|
50
86
|
}
|
|
51
|
-
const
|
|
52
|
-
|
|
53
|
-
if (errorMessage.includes("fulfilled") ||
|
|
87
|
+
const unwrapped = (0, unwrap_workflow_error_1.unwrapWorkflowError)(error);
|
|
88
|
+
const errorMessage = unwrapped.message;
|
|
89
|
+
if (errorMessage.includes("fulfilled") ||
|
|
90
|
+
errorMessage.includes("shipped") ||
|
|
91
|
+
errorMessage.includes("fulfillment")) {
|
|
54
92
|
throw new utils_1.MedusaError(utils_1.MedusaError.Types.NOT_ALLOWED, "Cannot cancel order: Some items have already been fulfilled or shipped");
|
|
55
93
|
}
|
|
56
|
-
|
|
94
|
+
const knownTypes = new Set(Object.values(utils_1.MedusaError.Types));
|
|
95
|
+
const errorType = unwrapped.type && knownTypes.has(unwrapped.type)
|
|
96
|
+
? unwrapped.type
|
|
97
|
+
: utils_1.MedusaError.Types.UNEXPECTED_STATE;
|
|
98
|
+
throw new utils_1.MedusaError(errorType, `Failed to cancel order: ${errorMessage}`);
|
|
57
99
|
}
|
|
100
|
+
}
|
|
101
|
+
exports.cancelOrderStep = (0, workflows_sdk_1.createStep)("cancel-order-step", async (input, { container }) => {
|
|
102
|
+
const output = await executeCancelOrder(input, container);
|
|
103
|
+
return new workflows_sdk_1.StepResponse(output);
|
|
58
104
|
});
|
|
59
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
105
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FuY2VsLW9yZGVyLXN0ZXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvd29ya2Zsb3dzL3N0ZXBzL2NhbmNlbC1vcmRlci1zdGVwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQXNEQSwwRUF3Q0M7QUFFRCxnREEwR0M7QUExTUQscURBR2tDO0FBQ2xDLHFFQUE0RTtBQUM1RSw0REFHb0M7QUFHcEMsdUVBQXlFO0FBQ3pFLDZFQUF1RTtBQXNDdkU7OztHQUdHO0FBQ0ksS0FBSyxVQUFVLCtCQUErQixDQUNuRCxTQUFtQyxFQUNuQyxPQUFlLEVBQ2YsaUJBQXVEO0lBRXZELElBQUksS0FBbUIsQ0FBQTtJQUN2QixJQUFJLENBQUM7UUFDSCxLQUFLLEdBQUcsU0FBUyxDQUFDLE9BQU8sQ0FBZSxpQ0FBeUIsQ0FBQyxLQUFLLENBQUMsQ0FBQTtJQUMxRSxDQUFDO0lBQUMsTUFBTSxDQUFDO1FBQ1AsT0FBTTtJQUNSLENBQUM7SUFFRCxNQUFNLEVBQUUsSUFBSSxFQUFFLEdBQUcsTUFBTSxLQUFLLENBQUMsS0FBSyxDQUFDO1FBQ2pDLE1BQU0sRUFBRSxPQUFPO1FBQ2YsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLGlCQUFpQixFQUFFLDBCQUEwQixFQUFFLHlCQUF5QixDQUFDO1FBQ3hGLE9BQU8sRUFBRSxFQUFFLEVBQUUsRUFBRSxPQUFPLEVBQUU7S0FDekIsQ0FBQyxDQUFBO0lBRUYsTUFBTSxRQUFRLEdBQUcsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDMUIsTUFBTSxZQUFZLEdBQUcsQ0FBQyxRQUFRLEVBQUUsWUFBWSxJQUFJLEVBQUUsQ0FBeUIsQ0FBQTtJQUMzRSxNQUFNLElBQUksR0FBRyxZQUFZLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxJQUFJLENBQUMsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxDQUFBO0lBRWhFLElBQUks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
|
package/README.md
CHANGED
|
@@ -150,7 +150,9 @@ Most production values are expected to be supplied via plugin options in `medusa
|
|
|
150
150
|
| GET | `/store/guest-orders/:id` | Guest JWT | Get guest order. |
|
|
151
151
|
| POST | `/store/guest-orders/:id/cancel` | Guest JWT | Cancel guest order. |
|
|
152
152
|
| POST | `/store/guest-orders/:id/reorder` | Guest JWT | Reorder guest order. |
|
|
153
|
-
| POST | `/store/guest-orders/:id/returns` | Guest JWT | Create guest return. |
|
|
153
|
+
| POST | `/store/guest-orders/:id/returns` | Guest JWT | Create guest return (optional `refund_payment` / `refund_payment_id`). |
|
|
154
|
+
| GET/POST | `/store/guest-orders/:id/payment-details` | Guest JWT | List / create guest refund destinations. |
|
|
155
|
+
| PUT | `/store/guest-orders/:id/returns/:return_id/refund-payment` | Guest JWT | Link payment_detail to return mapping. |
|
|
154
156
|
| GET | `/store/guest-orders/:id/swaps` | Guest JWT | List guest exchange requests. |
|
|
155
157
|
| POST | `/store/guest-orders/:id/swaps` | Guest JWT | Create guest exchange request. |
|
|
156
158
|
| GET | `/store/guest-orders/:id/swaps/:swap_id` | Guest JWT | Get guest exchange request. |
|
|
@@ -268,9 +270,11 @@ curl "http://localhost:9000/admin/orders/order_123/refund-context" \
|
|
|
268
270
|
|---|---|---|
|
|
269
271
|
| OTP request fails with template/config message | Missing `email.otpTemplate` or unresolved plugin options | Configure plugin options in `medusa-config.ts`; verify template path exists. |
|
|
270
272
|
| Guest JWT endpoints return unauthorized | Invalid/expired token or `jwtSecret` mismatch | Re-run OTP verify and ensure same `jwtSecret` is used in runtime config. |
|
|
273
|
+
| Store cancel returns generic `An error occurred` | Workflow failure was wrapped and not unwrapped by the cancel route | Upgrade this plugin. Nested Medusa/workflow errors are now unwrapped into a real `message`. Check payment refund/void logs if cancel still fails. |
|
|
274
|
+
| Cancel blocked by open fulfillments on a “not fulfilled” order | Core cancel requires all fulfillments to have `canceled_at` | Upgrade this plugin. Unshipped open fulfillments are canceled automatically before core cancel. |
|
|
271
275
|
| Return/exchange blocked with `RETURN_WINDOW_EXPIRED` | Delivery date outside configured window | Increase `returnValidInDays`/`exchangeValidInDays` or update storefront UX for expiry handling. |
|
|
272
276
|
| Refund mapping routes fail | `refund-payment-mapping` module not registered/migrated | Register module and run migrations. |
|
|
273
|
-
| Guest return shows no payment method in Admin | Guest
|
|
277
|
+
| Guest return shows no payment method in Admin | Guest COD returns previously stored `payment_id=null` and guests could not create/link payment details | Upgrade this plugin. Pass `refund_payment` / `refund_payment_id` on guest return create, or use `POST /store/guest-orders/:id/payment-details` + `PUT .../returns/:return_id/refund-payment`. |
|
|
274
278
|
| Cannot set default payment via create/update | API intentionally blocks `is_default` in request body | Use `POST /store/payment-details/:id/make-default`. |
|
|
275
279
|
| No development stack traces in API errors | `NODE_ENV` not `development` | Set `NODE_ENV=development` locally when debugging. |
|
|
276
280
|
|
|
@@ -316,6 +320,8 @@ This plugin is compatible with Medusa v2 (e.g. `@medusajs/framework` and `@medus
|
|
|
316
320
|
## Features
|
|
317
321
|
|
|
318
322
|
- **Order Management**: Cancel and reorder for both authenticated customers and guest orders
|
|
323
|
+
- **Cancel error surfacing**: Customer/guest cancel routes unwrap nested Medusa workflow errors so the storefront shows the real failure (not a bare `An error occurred`)
|
|
324
|
+
- **Cancel pre-clears unshipped fulfillments**: Before calling Medusa core cancel, open unshipped fulfillments are canceled so pending orders are not blocked by fulfillment rows
|
|
319
325
|
- **Authenticated Customer APIs**: Store endpoints for logged-in customers to cancel orders (`/store/orders/cancel/:order_id`), reorder (`/store/orders/reorder/:order_id`), manage returns (`/store/returns`), and manage exchanges (`/store/swaps`)
|
|
320
326
|
- **Guest Order Portal**: OTP-based look-up for guest users with full order management (view orders, initiate returns, cancel, reorder)
|
|
321
327
|
- **Guest Order Actions**: Secure JWT-protected endpoints for guest users to view orders, initiate returns (via Medusa workflow), cancel orders, reorder (all under `/store/guest-orders/:id/...`)
|
|
@@ -681,9 +687,11 @@ The plugin provides the following store API endpoints for the Guest Order Portal
|
|
|
681
687
|
|
|
682
688
|
#### Guest Order Actions
|
|
683
689
|
- `GET /store/guest-orders/:id` - Get full details for a specific guest order (requires guest JWT).
|
|
684
|
-
- `POST /store/guest-orders/:id/returns` - Initiate a return request for a guest order.
|
|
690
|
+
- `POST /store/guest-orders/:id/returns` - Initiate a return request for a guest order. Optional body fields: `refund_payment_id`, or inline `refund_payment: { type, detail_json }` (e.g. UPI). COD guest returns require a refund destination.
|
|
691
|
+
- `GET/POST /store/guest-orders/:id/payment-details` - List / create refund destinations (UPI/bank/card) for the guest order's customer.
|
|
692
|
+
- `PUT /store/guest-orders/:id/returns/:return_id/refund-payment` - Link a `payment_id` to the return's refund mapping.
|
|
685
693
|
|
|
686
|
-
Guest
|
|
694
|
+
Guest prepaid refunds still default to the original checkout method when no destination is specified. Guest COD refunds store the provided UPI/bank/card on `refund_payment_mapping` so Admin Refund Payment can display it.
|
|
687
695
|
- `POST /store/guest-orders/:id/cancel` - Cancel a guest order.
|
|
688
696
|
- `POST /store/guest-orders/:id/reorder` - Reorder a guest order (creates a new cart with the same items).
|
|
689
697
|
- `GET /store/guest-orders/:id/swaps` - List exchange requests for the guest order.
|
|
@@ -1568,6 +1576,21 @@ Returns store rich metadata for audit trails:
|
|
|
1568
1576
|
|
|
1569
1577
|
## Known Issues & Fixes
|
|
1570
1578
|
|
|
1579
|
+
### Issue: Admin/store return lists crash with `isInitialized` on Medusa 2.21
|
|
1580
|
+
|
|
1581
|
+
**Problem:**
|
|
1582
|
+
`GET /admin/return` (and store return list/detail) threw `Cannot read properties of undefined (reading 'isInitialized')` from `@medusajs/order` `ReturnRepository.loadShippingAdjustments`. The Admin Returns page returned HTTP 500.
|
|
1583
|
+
|
|
1584
|
+
**Root Cause:**
|
|
1585
|
+
Medusa 2.21 `listAndCountReturns` / `retrieveReturn` with `shipping_methods` hydrates the parent order's `order_shipping` rows and reads `shipping_method.adjustments.isInitialized`. Orphan join rows (missing nested `shipping_method`) crash the whole list.
|
|
1586
|
+
|
|
1587
|
+
**Solution:**
|
|
1588
|
+
Return list/detail routes load returns through Query Graph (`loadReturnsViaQuery` / `loadReturnByIdViaQuery`) without `shipping_methods`. Shipping methods for refund charges are attached in a separate try/catch (`attachReturnShippingMethods`) so a hydrate failure cannot take down the list.
|
|
1589
|
+
|
|
1590
|
+
**Prevention:**
|
|
1591
|
+
- Do not call `OrderModule.listAndCountReturns` / `retrieveReturn` with `shipping_methods` on Medusa 2.21
|
|
1592
|
+
- Keep list Graph fields free of `shipping_methods*`
|
|
1593
|
+
|
|
1571
1594
|
### Issue: Storefront return tracking can show items as received after a premature refund
|
|
1572
1595
|
|
|
1573
1596
|
**Problem:**
|