@mercurjs/core 2.3.0-canary.4 → 2.3.1
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.
|
@@ -9,7 +9,7 @@ const GET = async (req, res) => {
|
|
|
9
9
|
const workflow = (0, core_flows_1.getOrderDetailWorkflow)(req.scope);
|
|
10
10
|
const { result } = await workflow.run({
|
|
11
11
|
input: {
|
|
12
|
-
fields: req.queryConfig.fields,
|
|
12
|
+
fields: (0, helpers_1.withCartPaymentCollectionFields)(req.queryConfig.fields),
|
|
13
13
|
order_id: req.params.id,
|
|
14
14
|
},
|
|
15
15
|
});
|
|
@@ -17,4 +17,4 @@ const GET = async (req, res) => {
|
|
|
17
17
|
res.json({ order: result });
|
|
18
18
|
};
|
|
19
19
|
exports.GET = GET;
|
|
20
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3ZlbmRvci9vcmRlcnMvW2lkXS9yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxxREFBNkQ7QUFPN0Qsd0NBSW1CO0FBRVosTUFBTSxHQUFHLEdBQUcsS0FBSyxFQUN0QixHQUErQixFQUMvQixHQUFrRCxFQUNsRCxFQUFFO0lBQ0YsTUFBTSxRQUFRLEdBQUcsR0FBRyxDQUFDLGNBQWUsQ0FBQyxTQUFTLENBQUE7SUFFOUMsTUFBTSxJQUFBLDZCQUFtQixFQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsUUFBUSxFQUFFLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUE7SUFFN0QsTUFBTSxRQUFRLEdBQUcsSUFBQSxtQ0FBc0IsRUFBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUE7SUFDbEQsTUFBTSxFQUFFLE1BQU0sRUFBRSxHQUFHLE1BQU0sUUFBUSxDQUFDLEdBQUcsQ0FBQztRQUNwQyxLQUFLLEVBQUU7WUFDTCxNQUFNLEVBQUUsSUFBQSx5Q0FBK0IsRUFBQyxHQUFHLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQztZQUMvRCxRQUFRLEVBQUUsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFO1NBQ3hCO0tBQ0YsQ0FBQyxDQUFBO0lBRUYsSUFBQSwwQ0FBZ0MsRUFBQyxNQUFlLENBQUMsQ0FBQTtJQUVqRCxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsS0FBSyxFQUFFLE1BQWdELEVBQUUsQ0FBQyxDQUFBO0FBQ3ZFLENBQUMsQ0FBQTtBQW5CWSxRQUFBLEdBQUcsT0FtQmYifQ==
|
|
@@ -4,7 +4,9 @@ type OrderWithCartPaymentCollection = {
|
|
|
4
4
|
payment_collection?: unknown;
|
|
5
5
|
} | null;
|
|
6
6
|
payment_collections?: unknown[];
|
|
7
|
+
payment_status?: string;
|
|
7
8
|
};
|
|
9
|
+
export declare const withCartPaymentCollectionFields: (fields: string[]) => string[];
|
|
8
10
|
export declare const normalizeOrderPaymentCollections: <T extends OrderWithCartPaymentCollection>(order: T) => T;
|
|
9
11
|
export declare const validateSellerOrder: (scope: MedusaContainer, sellerId: string, orderIdOrIds: string | string[]) => Promise<void>;
|
|
10
12
|
export {};
|
|
@@ -1,14 +1,35 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.validateSellerOrder = exports.normalizeOrderPaymentCollections = void 0;
|
|
3
|
+
exports.validateSellerOrder = exports.normalizeOrderPaymentCollections = exports.withCartPaymentCollectionFields = void 0;
|
|
4
4
|
const utils_1 = require("@medusajs/framework/utils");
|
|
5
|
+
const utils_2 = require("@medusajs/framework/utils");
|
|
6
|
+
const aggregate_status_1 = require("../../../workflows/order-group/utils/aggregate-status");
|
|
7
|
+
// The shared cart payment collection is reached through the cart, not linked
|
|
8
|
+
// to the order. These fields must always be loaded so the routes can normalize
|
|
9
|
+
// them back onto `payment_collections` and recompute `payment_status` — even
|
|
10
|
+
// when the client sends an absolute `fields=` list that would otherwise replace
|
|
11
|
+
// the route defaults.
|
|
12
|
+
const CART_PAYMENT_COLLECTION_FIELDS = [
|
|
13
|
+
"cart.payment_collection.*",
|
|
14
|
+
"cart.payment_collection.payments.*",
|
|
15
|
+
"cart.payment_collection.payments.refunds.*",
|
|
16
|
+
"cart.payment_collection.payments.refunds.refund_reason.*",
|
|
17
|
+
"cart.payment_collection.payment_sessions.*",
|
|
18
|
+
];
|
|
19
|
+
const withCartPaymentCollectionFields = (fields) => {
|
|
20
|
+
return (0, utils_2.deduplicate)([...fields, ...CART_PAYMENT_COLLECTION_FIELDS]);
|
|
21
|
+
};
|
|
22
|
+
exports.withCartPaymentCollectionFields = withCartPaymentCollectionFields;
|
|
5
23
|
// The shared cart payment collection is fetched via `cart.payment_collection`
|
|
6
24
|
// (it is not linked directly to an order). Expose it back on the order under
|
|
7
|
-
// `payment_collections` so consumers keep the familiar shape
|
|
25
|
+
// `payment_collections` so consumers keep the familiar shape, and recompute
|
|
26
|
+
// `payment_status` from it — Medusa's aggregation reads the linked payment
|
|
27
|
+
// collections, which are always empty for split orders under the cart-path model.
|
|
8
28
|
const normalizeOrderPaymentCollections = (order) => {
|
|
9
29
|
const paymentCollection = order.cart?.payment_collection;
|
|
10
30
|
order.payment_collections = paymentCollection ? [paymentCollection] : [];
|
|
11
31
|
delete order.cart;
|
|
32
|
+
order.payment_status = (0, aggregate_status_1.getLastPaymentStatus)(order);
|
|
12
33
|
return order;
|
|
13
34
|
};
|
|
14
35
|
exports.normalizeOrderPaymentCollections = normalizeOrderPaymentCollections;
|
|
@@ -30,4 +51,4 @@ const validateSellerOrder = async (scope, sellerId, orderIdOrIds) => {
|
|
|
30
51
|
}
|
|
31
52
|
};
|
|
32
53
|
exports.validateSellerOrder = validateSellerOrder;
|
|
33
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
54
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9hcGkvdmVuZG9yL29yZGVycy9oZWxwZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUVBLHFEQUdrQztBQUVsQyxxREFBdUQ7QUFFdkQsNEZBQTRGO0FBUTVGLDZFQUE2RTtBQUM3RSwrRUFBK0U7QUFDL0UsNkVBQTZFO0FBQzdFLGdGQUFnRjtBQUNoRixzQkFBc0I7QUFDdEIsTUFBTSw4QkFBOEIsR0FBRztJQUNyQywyQkFBMkI7SUFDM0Isb0NBQW9DO0lBQ3BDLDRDQUE0QztJQUM1QywwREFBMEQ7SUFDMUQsNENBQTRDO0NBQzdDLENBQUE7QUFFTSxNQUFNLCtCQUErQixHQUFHLENBQzdDLE1BQWdCLEVBQ04sRUFBRTtJQUNaLE9BQU8sSUFBQSxtQkFBVyxFQUFDLENBQUMsR0FBRyxNQUFNLEVBQUUsR0FBRyw4QkFBOEIsQ0FBQyxDQUFDLENBQUE7QUFDcEUsQ0FBQyxDQUFBO0FBSlksUUFBQSwrQkFBK0IsbUNBSTNDO0FBRUQsOEVBQThFO0FBQzlFLDZFQUE2RTtBQUM3RSw0RUFBNEU7QUFDNUUsMkVBQTJFO0FBQzNFLGtGQUFrRjtBQUMzRSxNQUFNLGdDQUFnQyxHQUFHLENBRzlDLEtBQVEsRUFDTCxFQUFFO0lBQ0wsTUFBTSxpQkFBaUIsR0FBRyxLQUFLLENBQUMsSUFBSSxFQUFFLGtCQUFrQixDQUFBO0lBQ3hELEtBQUssQ0FBQyxtQkFBbUIsR0FBRyxpQkFBaUIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUE7SUFDeEUsT0FBTyxLQUFLLENBQUMsSUFBSSxDQUFBO0lBRWpCLEtBQUssQ0FBQyxjQUFjLEdBQUcsSUFBQSx1Q0FBb0IsRUFDekMsS0FBa0MsQ0FDbkMsQ0FBQTtJQUVELE9BQU8sS0FBSyxDQUFBO0FBQ2QsQ0FBQyxDQUFBO0FBZFksUUFBQSxnQ0FBZ0Msb0NBYzVDO0FBRU0sTUFBTSxtQkFBbUIsR0FBRyxLQUFLLEVBQ3RDLEtBQXNCLEVBQ3RCLFFBQWdCLEVBQ2hCLFlBQStCLEVBQy9CLEVBQUU7SUFDRixNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLGlDQUF5QixDQUFDLEtBQUssQ0FBQyxDQUFBO0lBRTVELE1BQU0sUUFBUSxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsQ0FBQyxZQUFZLENBQUMsQ0FBQTtJQUU1RSxNQUFNLEVBQUUsSUFBSSxFQUFFLFlBQVksRUFBRSxHQUFHLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztRQUMvQyxNQUFNLEVBQUUsY0FBYztRQUN0QixPQUFPLEVBQUU7WUFDUCxTQUFTLEVBQUUsUUFBUTtZQUNuQixRQUFRLEVBQUUsUUFBUTtTQUNuQjtRQUNELE1BQU0sRUFBRSxDQUFDLFdBQVcsRUFBRSxVQUFVLENBQUM7S0FDbEMsQ0FBQyxDQUFBO0lBRUYsTUFBTSxhQUFhLEdBQUcsSUFBSSxHQUFHLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUE7SUFDcEUsTUFBTSxlQUFlLEdBQUcsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7SUFFdkUsSUFBSSxlQUFlLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRSxDQUFDO1FBQy9CLE1BQU0sSUFBSSxtQkFBVyxDQUNuQixtQkFBVyxDQUFDLEtBQUssQ0FBQyxTQUFTLEVBQzNCLGtCQUFrQixlQUFlLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FDN0QsQ0FBQTtJQUNILENBQUM7QUFDSCxDQUFDLENBQUE7QUEzQlksUUFBQSxtQkFBbUIsdUJBMkIvQiJ9
|
|
@@ -14,7 +14,7 @@ const GET = async (req, res) => {
|
|
|
14
14
|
const workflow = (0, core_flows_1.getOrdersListWorkflow)(req.scope);
|
|
15
15
|
const { result } = await workflow.run({
|
|
16
16
|
input: {
|
|
17
|
-
fields: req.queryConfig.fields,
|
|
17
|
+
fields: (0, helpers_1.withCartPaymentCollectionFields)(req.queryConfig.fields),
|
|
18
18
|
variables,
|
|
19
19
|
},
|
|
20
20
|
});
|
|
@@ -28,4 +28,4 @@ const GET = async (req, res) => {
|
|
|
28
28
|
});
|
|
29
29
|
};
|
|
30
30
|
exports.GET = GET;
|
|
31
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3ZlbmRvci9vcmRlcnMvcm91dGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEscURBQTREO0FBUTVELHVDQUdrQjtBQUVYLE1BQU0sR0FBRyxHQUFHLEtBQUssRUFDdEIsR0FBK0IsRUFDL0IsR0FBc0QsRUFDdEQsRUFBRTtJQUNGLE1BQU0sU0FBUyxHQUFHO1FBQ2hCLE9BQU8sRUFBRTtZQUNQLEdBQUcsR0FBRyxDQUFDLGdCQUFnQjtZQUN2QixjQUFjLEVBQUUsS0FBSztTQUN0QjtRQUNELEdBQUcsR0FBRyxDQUFDLFdBQVcsQ0FBQyxVQUFVO0tBQzlCLENBQUE7SUFFRCxNQUFNLFFBQVEsR0FBRyxJQUFBLGtDQUFxQixFQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQTtJQUNqRCxNQUFNLEVBQUUsTUFBTSxFQUFFLEdBQUcsTUFBTSxRQUFRLENBQUMsR0FBRyxDQUFDO1FBQ3BDLEtBQUssRUFBRTtZQUNMLE1BQU0sRUFBRSxJQUFBLHlDQUErQixFQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDO1lBQy9ELFNBQVM7U0FDVjtLQUNGLENBQUMsQ0FBQTtJQUVGLE1BQU0sRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLEdBQUcsTUFHMUIsQ0FBQTtJQUVELElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLElBQUEsMENBQWdDLEVBQUMsS0FBYyxDQUFDLENBQUMsQ0FBQTtJQUV6RSxHQUFHLENBQUMsSUFBSSxDQUFDO1FBQ1AsTUFBTSxFQUFFLElBQThEO1FBQ3RFLEtBQUssRUFBRSxRQUFRLENBQUMsS0FBSztRQUNyQixNQUFNLEVBQUUsUUFBUSxDQUFDLElBQUk7UUFDckIsS0FBSyxFQUFFLFFBQVEsQ0FBQyxJQUFJO0tBQ3JCLENBQUMsQ0FBQTtBQUNKLENBQUMsQ0FBQTtBQWpDWSxRQUFBLEdBQUcsT0FpQ2YifQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mercurjs/core",
|
|
3
|
-
"version": "2.3.
|
|
3
|
+
"version": "2.3.1",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "https://github.com/mercurjs/mercur",
|
|
@@ -60,17 +60,17 @@
|
|
|
60
60
|
"@medusajs/medusa": "2.18.0",
|
|
61
61
|
"@medusajs/test-utils": "2.18.0",
|
|
62
62
|
"@medusajs/ui": "4.1.19",
|
|
63
|
-
"@mercurjs/types": "2.3.
|
|
63
|
+
"@mercurjs/types": "2.3.1",
|
|
64
64
|
"@swc/core": "^1.7.28",
|
|
65
65
|
"@types/cors": "^2.8.17",
|
|
66
66
|
"@types/express": "^4.17.21",
|
|
67
67
|
"@types/multer": "^2.0.0",
|
|
68
68
|
"@types/node": "^26.1.0",
|
|
69
|
-
"@types/react": "^
|
|
69
|
+
"@types/react": "^18.3.2",
|
|
70
70
|
"@types/react-dom": "^18.2.25",
|
|
71
71
|
"prop-types": "^15.8.1",
|
|
72
72
|
"react": "^18.2.0",
|
|
73
|
-
"react-dom": "^
|
|
73
|
+
"react-dom": "^18.2.0",
|
|
74
74
|
"ts-node": "^10.9.2",
|
|
75
75
|
"tsx": "^4.19.2",
|
|
76
76
|
"typescript": "5.9.3",
|
|
@@ -79,7 +79,7 @@
|
|
|
79
79
|
"multer": "^2.0.2",
|
|
80
80
|
"http-proxy-middleware": "^3.0.3",
|
|
81
81
|
"jsonwebtoken": "^9.0.2",
|
|
82
|
-
"@mercurjs/cli": "2.3.
|
|
82
|
+
"@mercurjs/cli": "2.3.1"
|
|
83
83
|
},
|
|
84
84
|
"peerDependencies": {
|
|
85
85
|
"@medusajs/admin-sdk": ">=2.18.0",
|