order-management 0.0.92 → 0.0.93
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]/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/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/helpers/resolve-return-refund-payment.js +66 -0
- package/.medusa/server/src/helpers/returns.js +140 -2
- package/README.md +23 -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":"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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. |
|
|
@@ -270,7 +272,7 @@ curl "http://localhost:9000/admin/orders/order_123/refund-context" \
|
|
|
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. |
|
|
271
273
|
| Return/exchange blocked with `RETURN_WINDOW_EXPIRED` | Delivery date outside configured window | Increase `returnValidInDays`/`exchangeValidInDays` or update storefront UX for expiry handling. |
|
|
272
274
|
| 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
|
|
275
|
+
| 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
276
|
| Cannot set default payment via create/update | API intentionally blocks `is_default` in request body | Use `POST /store/payment-details/:id/make-default`. |
|
|
275
277
|
| No development stack traces in API errors | `NODE_ENV` not `development` | Set `NODE_ENV=development` locally when debugging. |
|
|
276
278
|
|
|
@@ -681,9 +683,11 @@ The plugin provides the following store API endpoints for the Guest Order Portal
|
|
|
681
683
|
|
|
682
684
|
#### Guest Order Actions
|
|
683
685
|
- `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.
|
|
686
|
+
- `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.
|
|
687
|
+
- `GET/POST /store/guest-orders/:id/payment-details` - List / create refund destinations (UPI/bank/card) for the guest order's customer.
|
|
688
|
+
- `PUT /store/guest-orders/:id/returns/:return_id/refund-payment` - Link a `payment_id` to the return's refund mapping.
|
|
685
689
|
|
|
686
|
-
Guest
|
|
690
|
+
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
691
|
- `POST /store/guest-orders/:id/cancel` - Cancel a guest order.
|
|
688
692
|
- `POST /store/guest-orders/:id/reorder` - Reorder a guest order (creates a new cart with the same items).
|
|
689
693
|
- `GET /store/guest-orders/:id/swaps` - List exchange requests for the guest order.
|
|
@@ -1568,6 +1572,21 @@ Returns store rich metadata for audit trails:
|
|
|
1568
1572
|
|
|
1569
1573
|
## Known Issues & Fixes
|
|
1570
1574
|
|
|
1575
|
+
### Issue: Admin/store return lists crash with `isInitialized` on Medusa 2.21
|
|
1576
|
+
|
|
1577
|
+
**Problem:**
|
|
1578
|
+
`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.
|
|
1579
|
+
|
|
1580
|
+
**Root Cause:**
|
|
1581
|
+
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.
|
|
1582
|
+
|
|
1583
|
+
**Solution:**
|
|
1584
|
+
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.
|
|
1585
|
+
|
|
1586
|
+
**Prevention:**
|
|
1587
|
+
- Do not call `OrderModule.listAndCountReturns` / `retrieveReturn` with `shipping_methods` on Medusa 2.21
|
|
1588
|
+
- Keep list Graph fields free of `shipping_methods*`
|
|
1589
|
+
|
|
1571
1590
|
### Issue: Storefront return tracking can show items as received after a premature refund
|
|
1572
1591
|
|
|
1573
1592
|
**Problem:**
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "order-management",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.93",
|
|
4
4
|
"description": "A starter for Medusa plugins.",
|
|
5
5
|
"author": "Medusa (https://medusajs.com)",
|
|
6
6
|
"license": "MIT",
|
|
@@ -35,27 +35,27 @@
|
|
|
35
35
|
"prepublishOnly": "medusa plugin:build"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
|
-
"@medusajs/admin-sdk": "2.
|
|
39
|
-
"@medusajs/cli": "2.
|
|
40
|
-
"@medusajs/framework": "2.
|
|
41
|
-
"@medusajs/icons": "2.
|
|
42
|
-
"@medusajs/medusa": "2.
|
|
43
|
-
"@medusajs/test-utils": "2.
|
|
44
|
-
"@medusajs/ui": "4.
|
|
45
|
-
"@swc/core": "1.
|
|
38
|
+
"@medusajs/admin-sdk": "2.21.0",
|
|
39
|
+
"@medusajs/cli": "2.21.0",
|
|
40
|
+
"@medusajs/framework": "2.21.0",
|
|
41
|
+
"@medusajs/icons": "2.21.0",
|
|
42
|
+
"@medusajs/medusa": "2.21.0",
|
|
43
|
+
"@medusajs/test-utils": "2.21.0",
|
|
44
|
+
"@medusajs/ui": "4.2.4",
|
|
45
|
+
"@swc/core": "1.16.2",
|
|
46
46
|
"@types/jsonwebtoken": "^9.0.10",
|
|
47
|
-
"@types/node": "^20.
|
|
48
|
-
"@types/react": "^
|
|
49
|
-
"@types/react-dom": "^
|
|
47
|
+
"@types/node": "^22.20.3",
|
|
48
|
+
"@types/react": "^19.3.0",
|
|
49
|
+
"@types/react-dom": "^19.3.0",
|
|
50
50
|
"jsonwebtoken": "^9.0.3",
|
|
51
51
|
"medusa-plugin-dynamic-config": "0.0.36",
|
|
52
52
|
"prop-types": "^15.8.1",
|
|
53
|
-
"react": "^
|
|
54
|
-
"react-dom": "^
|
|
53
|
+
"react": "^19.3.0",
|
|
54
|
+
"react-dom": "^19.3.0",
|
|
55
55
|
"ts-node": "^10.9.2",
|
|
56
|
-
"typescript": "^5.
|
|
57
|
-
"vite": "^
|
|
58
|
-
"vitest": "^
|
|
56
|
+
"typescript": "^5.9.3",
|
|
57
|
+
"vite": "^8.3.0",
|
|
58
|
+
"vitest": "^5.0.1",
|
|
59
59
|
"yalc": "^1.0.0-pre.53"
|
|
60
60
|
},
|
|
61
61
|
"peerDependencies": {
|