@mercurjs/core 2.3.6-canary.8 → 2.3.6

package/.medusa/server/src/api/admin/order-groups/route.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GET = void 0;
 const order_group_1 = require("../../../workflows/order-group");
 const GET = async (req, res) => {
-    const { seller_id: sellerId, ...filterableFields } = req.filterableFields;
+    // `applyOrderGroupSellerFilter` already narrowed `id` to the seller's groups.
+    const { seller_id: _sellerId, ...filterableFields } = req.filterableFields;
     const { result } = await (0, order_group_1.getOrderGroupsListWorkflow)(req.scope).run({
         input: {
             fields: req.queryConfig.fields ?? [],
@@ -13,7 +14,6 @@ const GET = async (req, res) => {
                 take: req.queryConfig.pagination?.take,
                 order: req.queryConfig.pagination?.order,
             },
-            sellerId: sellerId,
         },
     });
     const { rows, metadata } = result;
@@ -25,4 +25,4 @@ const GET = async (req, res) => {
     });
 };
 exports.GET = GET;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL29yZGVyLWdyb3Vwcy9yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFNQSxnRUFBMkU7QUFFcEUsTUFBTSxHQUFHLEdBQUcsS0FBSyxFQUN0QixHQUErQixFQUMvQixHQUEwRCxFQUMxRCxFQUFFO0lBQ0YsTUFBTSxFQUFFLFNBQVMsRUFBRSxRQUFRLEVBQUUsR0FBRyxnQkFBZ0IsRUFBRSxHQUFHLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQTtJQUV6RSxNQUFNLEVBQUUsTUFBTSxFQUFFLEdBQUcsTUFBTSxJQUFBLHdDQUEwQixFQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUM7UUFDakUsS0FBSyxFQUFFO1lBQ0wsTUFBTSxFQUFFLEdBQUcsQ0FBQyxXQUFXLENBQUMsTUFBTSxJQUFJLEVBQUU7WUFDcEMsU0FBUyxFQUFFO2dCQUNULEdBQUcsZ0JBQWdCO2dCQUNuQixJQUFJLEVBQUUsR0FBRyxDQUFDLFdBQVcsQ0FBQyxVQUFVLEVBQUUsSUFBSTtnQkFDdEMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxXQUFXLENBQUMsVUFBVSxFQUFFLElBQUk7Z0JBQ3RDLEtBQUssRUFBRSxHQUFHLENBQUMsV0FBVyxDQUFDLFVBQVUsRUFBRSxLQUErQjthQUNuRTtZQUNELFFBQVEsRUFBRSxRQUF5QztTQUNwRDtLQUNGLENBQUMsQ0FBQTtJQUVGLE1BQU0sRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLEdBQUcsTUFBTSxDQUFBO0lBRWpDLEdBQUcsQ0FBQyxJQUFJLENBQUM7UUFDUCxZQUFZLEVBQUUsSUFBSTtRQUNsQixLQUFLLEVBQUUsUUFBUSxFQUFFLEtBQUssSUFBSSxDQUFDO1FBQzNCLE1BQU0sRUFBRSxRQUFRLEVBQUUsSUFBSSxJQUFJLENBQUM7UUFDM0IsS0FBSyxFQUFFLFFBQVEsRUFBRSxJQUFJLElBQUksQ0FBQztLQUMzQixDQUFDLENBQUE7QUFDSixDQUFDLENBQUE7QUEzQlksUUFBQSxHQUFHLE9BMkJmIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL29yZGVyLWdyb3Vwcy9yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFNQSxnRUFBMkU7QUFFcEUsTUFBTSxHQUFHLEdBQUcsS0FBSyxFQUN0QixHQUErQixFQUMvQixHQUEwRCxFQUMxRCxFQUFFO0lBQ0YsOEVBQThFO0lBQzlFLE1BQU0sRUFBRSxTQUFTLEVBQUUsU0FBUyxFQUFFLEdBQUcsZ0JBQWdCLEVBQUUsR0FBRyxHQUFHLENBQUMsZ0JBQWdCLENBQUE7SUFFMUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxHQUFHLE1BQU0sSUFBQSx3Q0FBMEIsRUFBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDO1FBQ2pFLEtBQUssRUFBRTtZQUNMLE1BQU0sRUFBRSxHQUFHLENBQUMsV0FBVyxDQUFDLE1BQU0sSUFBSSxFQUFFO1lBQ3BDLFNBQVMsRUFBRTtnQkFDVCxHQUFHLGdCQUFnQjtnQkFDbkIsSUFBSSxFQUFFLEdBQUcsQ0FBQyxXQUFXLENBQUMsVUFBVSxFQUFFLElBQUk7Z0JBQ3RDLElBQUksRUFBRSxHQUFHLENBQUMsV0FBVyxDQUFDLFVBQVUsRUFBRSxJQUFJO2dCQUN0QyxLQUFLLEVBQUUsR0FBRyxDQUFDLFdBQVcsQ0FBQyxVQUFVLEVBQUUsS0FBK0I7YUFDbkU7U0FDRjtLQUNGLENBQUMsQ0FBQTtJQUVGLE1BQU0sRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLEdBQUcsTUFBTSxDQUFBO0lBRWpDLEdBQUcsQ0FBQyxJQUFJLENBQUM7UUFDUCxZQUFZLEVBQUUsSUFBSTtRQUNsQixLQUFLLEVBQUUsUUFBUSxFQUFFLEtBQUssSUFBSSxDQUFDO1FBQzNCLE1BQU0sRUFBRSxRQUFRLEVBQUUsSUFBSSxJQUFJLENBQUM7UUFDM0IsS0FBSyxFQUFFLFFBQVEsRUFBRSxJQUFJLElBQUksQ0FBQztLQUMzQixDQUFDLENBQUE7QUFDSixDQUFDLENBQUE7QUEzQlksUUFBQSxHQUFHLE9BMkJmIn0=

package/.medusa/server/src/api/utils/scan-unauthenticated-routes.js

@@ -34,7 +34,9 @@ function hasAuthenticateFalse(filePath) {
     try {
         const content = fs_1.default.readFileSync(filePath, "utf-8");
         return (/export\s+const\s+AUTHENTICATE\s*=\s*false/.test(content) ||
-            /export\s*\{[^}]*\bAUTHENTICATE\b[^}]*\}/.test(content));
+            /export\s*\{[^}]*\bAUTHENTICATE\b[^}]*\}/.test(content) ||
+            // Plugin routes are scanned in their compiled CommonJS output.
+            /\bexports\.AUTHENTICATE\s*=\s*false\b/.test(content));
     }
     catch {
         return false;
@@ -83,4 +85,4 @@ const resolvePluginUnauthenticatedRoutes = (req) => {
     return pluginPatterns;
 };
 exports.resolvePluginUnauthenticatedRoutes = resolvePluginUnauthenticatedRoutes;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2Nhbi11bmF1dGhlbnRpY2F0ZWQtcm91dGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL2FwaS91dGlscy9zY2FuLXVuYXV0aGVudGljYXRlZC1yb3V0ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBOEVBLDhEQUVDO0FBaEZELDRDQUFtQjtBQUNuQixnREFBdUI7QUFFdkIscURBR2tDO0FBRWxDLE1BQU0sZ0JBQWdCLEdBQUcsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLENBQUMsQ0FBQTtBQUV2RCxTQUFTLFdBQVcsQ0FBQyxHQUFXO0lBQzlCLE1BQU0sS0FBSyxHQUFhLEVBQUUsQ0FBQTtJQUUxQixJQUFJLENBQUMsWUFBRSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO1FBQ3hCLE9BQU8sS0FBSyxDQUFBO0lBQ2QsQ0FBQztJQUVELE1BQU0sT0FBTyxHQUFHLFlBQUUsQ0FBQyxXQUFXLENBQUMsR0FBRyxFQUFFLEVBQUUsYUFBYSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUE7SUFFNUQsS0FBSyxNQUFNLEtBQUssSUFBSSxPQUFPLEVBQUUsQ0FBQztRQUM1QixNQUFNLFFBQVEsR0FBRyxjQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUE7UUFFM0MsSUFBSSxLQUFLLENBQUMsV0FBVyxFQUFFLEVBQUUsQ0FBQztZQUN4QixLQUFLLENBQUMsSUFBSSxDQUFDLEdBQUcsV0FBVyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUE7UUFDdEMsQ0FBQzthQUFNLElBQUksS0FBSyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUM7WUFDMUIsTUFBTSxHQUFHLEdBQUcsY0FBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUE7WUFDcEMsTUFBTSxRQUFRLEdBQUcsY0FBSSxDQUFDLFFBQVEsQ0FB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2Nhbi11bmF1dGhlbnRpY2F0ZWQtcm91dGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL2FwaS91dGlscy9zY2FuLXVuYXV0aGVudGljYXRlZC1yb3V0ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBZ0ZBLDhEQUVDO0FBbEZELDRDQUFtQjtBQUNuQixnREFBdUI7QUFFdkIscURBR2tDO0FBRWxDLE1BQU0sZ0JBQWdCLEdBQUcsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLENBQUMsQ0FBQTtBQUV2RCxTQUFTLFdBQVcsQ0FBQyxHQUFXO0lBQzlCLE1BQU0sS0FBSyxHQUFhLEVBQUUsQ0FBQTtJQUUxQixJQUFJLENBQUMsWUFBRSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO1FBQ3hCLE9BQU8sS0FBSyxDQUFBO0lBQ2QsQ0FBQztJQUVELE1BQU0sT0FBTyxHQUFHLFlBQUUsQ0FBQyxXQUFXLENBQUMsR0FBRyxFQUFFLEVBQUUsYUFBYSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUE7SUFFNUQsS0FBSyxNQUFNLEtBQUssSUFBSSxPQUFPLEVBQUUsQ0FBQztRQUM1QixNQUFNLFFBQVEsR0FBRyxjQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUE7UUFFM0MsSUFBSSxLQUFLLENBQUMsV0FBVyxFQUFFLEVBQUUsQ0FBQztZQUN4QixLQUFLLENBQUMsSUFBSSxDQUFDLEdBQUcsV0FBVyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUE7UUFDdEMsQ0FBQzthQUFNLElBQUksS0FBSyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUM7WUFDMUIsTUFBTSxHQUFHLEdBQUcsY0FBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUE7WUFDcEMsTUFBTSxRQUFRLEdBQUcsY0FBSSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFBO1lBRS9DLElBQUksUUFBUSxLQUFLLE9BQU8sSUFBSSxnQkFBZ0IsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQztnQkFDM0QsS0FBSyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQTtZQUN0QixDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7SUFFRCxPQUFPLEtBQUssQ0FBQTtBQUNkLENBQUM7QUFFRCxTQUFTLG9CQUFvQixDQUFDLFFBQWdCO0lBQzVDLElBQUksQ0FBQztRQUNILE1BQU0sT0FBTyxHQUFHLFlBQUUsQ0FBQyxZQUFZLENBQUMsUUFBUSxFQUFFLE9BQU8sQ0FBQyxDQUFBO1FBQ2xELE9BQU8sQ0FDTCwyQ0FBMkMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO1lBQ3pELHlDQUF5QyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7WUFDdkQsK0RBQStEO1lBQy9ELHVDQUF1QyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FDdEQsQ0FBQTtJQUNILENBQUM7SUFBQyxNQUFNLENBQUM7UUFDUCxPQUFPLEtBQUssQ0FBQTtJQUNkLENBQUM7QUFDSCxDQUFDO0FBRUQsU0FBUyxlQUFlLENBQUMsUUFBZ0IsRUFBRSxNQUFjO0lBQ3ZELE1BQU0sWUFBWSxHQUFHLGNBQUksQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsR0FBRyxDQUFDLENBQUE7SUFDeEUsTUFBTSxPQUFPLEdBQUcsWUFBWSxDQUFDLE9BQU8sQ0FBQywyQkFBMkIsRUFBRSxFQUFFLENBQUMsQ0FBQTtJQUVyRSxNQUFNLFFBQVEsR0FBRyxPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQ25DLE1BQU0sYUFBYSxHQUFHLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRTtRQUM3QyxJQUFJLFVBQVUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztZQUM3QixPQUFPLE9BQU8sQ0FBQTtRQUNoQixDQUFDO1FBQ0QsT0FBTyxPQUFPLENBQUE7SUFDaEIsQ0FBQyxDQUFDLENBQUE7SUFFRixPQUFPLElBQUksTUFBTSxDQUFDLE1BQU0sR0FBRyxhQUFhLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLEdBQUcsQ0FBQyxDQUFBO0FBQzdELENBQUM7QUFFRCxTQUFTLGFBQWEsQ0FBQyxNQUFjO0lBQ25DLE1BQU0sTUFBTSxHQUFHLGNBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLEtBQUssQ0FBQyxDQUFBO0lBQ3ZDLE1BQU0sVUFBVSxHQUFHLFdBQVcsQ0FBQyxjQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsQ0FBQyxDQUFBO0lBQzNELE1BQU0sUUFBUSxHQUFhLEVBQUUsQ0FBQTtJQUU3QixLQUFLLE1BQU0sSUFBSSxJQUFJLFVBQVUsRUFBRSxDQUFDO1FBQzlCLElBQUksb0JBQW9CLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztZQUMvQixRQUFRLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQTtRQUM5QyxDQUFDO0lBQ0gsQ0FBQztJQUVELE9BQU8sUUFBUSxDQUFBO0FBQ2pCLENBQUM7QUFFRCxTQUFnQix5QkFBeUIsQ0FBQyxXQUFtQjtJQUMzRCxPQUFPLGFBQWEsQ0FBQyxjQUFJLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFBO0FBQ3JELENBQUM7QUFFRCxJQUFJLGNBQTZDLENBQUE7QUFFakQ7OztHQUdHO0FBQ0ksTUFBTSxrQ0FBa0MsR0FBRyxDQUNoRCxHQUFrQixFQUNDLEVBQUU7SUFDckIsY0FBYyxLQUFLLENBQUMsS0FBSyxJQUFJLEVBQUU7UUFDN0IsTUFBTSxZQUFZLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQ3BDLGlDQUF5QixDQUFDLGFBQWEsQ0FDeEMsQ0FBQTtRQUNELE1BQU0sT0FBTyxHQUFHLE1BQU0sSUFBQSwwQkFBa0IsRUFBQyxPQUFPLENBQUMsR0FBRyxFQUFFLEVBQUUsWUFBWSxDQUFDLENBQUE7UUFDckUsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUE7SUFDbkUsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxLQUFLLEVBQUUsRUFBRTtRQUNuQixjQUFjLEdBQUcsU0FBUyxDQUFBO1FBQzFCLE1BQU0sS0FBSyxDQUFBO0lBQ2IsQ0FBQyxDQUFDLENBQUE7SUFFRixPQUFPLGNBQWMsQ0FBQTtBQUN2QixDQUFDLENBQUE7QUFmWSxRQUFBLGtDQUFrQyxzQ0FlOUMifQ==

package/.medusa/server/src/api/utils/split-order-payment-status.d.ts

@@ -1,6 +1,8 @@
 type OrderWithCartPaymentCollection = {
     cart?: {
-        payment_collection?: unknown;
+        payment_collection?: {
+            metadata?: Record<string, unknown> | null;
+        } | null;
     } | null;
     payment_collections?: unknown[];
     payment_status?: string;

package/.medusa/server/src/api/utils/split-order-payment-status.js

@@ -3,36 +3,40 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOrderPaymentCollections = exports.withCartPaymentCollectionFields = void 0;
 const utils_1 = require("@medusajs/framework/utils");
 const aggregate_status_1 = require("../../workflows/order-group/utils/aggregate-status");
-// The shared cart payment collection is reached through the cart, not linked
-// to the order. These fields must always be loaded so the routes can normalize
-// them back onto `payment_collections` and recompute `payment_status` — even
-// when the client sends an absolute `fields=` list that would otherwise replace
-// the route defaults.
-const CART_PAYMENT_COLLECTION_FIELDS = [
-    "cart.payment_collection.*",
-    "cart.payment_collection.payments.*",
-    "cart.payment_collection.payments.refunds.*",
-    "cart.payment_collection.payments.refunds.refund_reason.*",
-    "cart.payment_collection.payment_sessions.*",
+const split_order_payment_group_1 = require("../../workflows/payment/utils/split-order-payment-group");
+// An order is paid through the cart's shared payment collection until that
+// payment is captured, and through its own linked collection afterwards. Both
+// are always loaded so the routes can pick the right one and recompute
+// `payment_status`, even when the client sends an absolute `fields=` list that
+// would otherwise replace the route defaults.
+const PAYMENT_COLLECTION_FIELDS = [
+    "*",
+    "payments.*",
+    "payments.refunds.*",
+    "payments.refunds.refund_reason.*",
+    "payment_sessions.*",
 ];
 const withCartPaymentCollectionFields = (fields) => {
-    return (0, utils_1.deduplicate)([...fields, ...CART_PAYMENT_COLLECTION_FIELDS]);
+    return (0, utils_1.deduplicate)([
+        ...fields,
+        ...PAYMENT_COLLECTION_FIELDS.map((f) => `payment_collections.${f}`),
+        ...PAYMENT_COLLECTION_FIELDS.map((f) => `cart.payment_collection.${f}`),
+    ]);
 };
 exports.withCartPaymentCollectionFields = withCartPaymentCollectionFields;
-// The shared cart payment collection is fetched via `cart.payment_collection`
-// (it is not linked directly to an order). Expose it back on the order under
-// `payment_collections` so consumers keep the familiar shape, and recompute
-// `payment_status` from it — Medusa's aggregation reads the linked payment
-// collections, which are always empty for split orders under the cart-path model.
+// Exposes the order's payment collections under `payment_collections` whichever
+// way they are attached, and recomputes `payment_status` from them: Medusa's
+// aggregation only reads the linked ones.
 const normalizeOrderPaymentCollections = (order) => {
-    const paymentCollection = order.cart?.payment_collection;
+    const hadCart = !!order.cart;
+    const paymentCollections = (0, split_order_payment_group_1.resolveOrderPaymentCollections)(order);
     delete order.cart;
-    if (!paymentCollection) {
+    if (!hadCart && !order.payment_collections) {
         return order;
     }
-    order.payment_collections = [paymentCollection];
+    order.payment_collections = paymentCollections;
     order.payment_status = (0, aggregate_status_1.getLastPaymentStatus)(order);
     return order;
 };
 exports.normalizeOrderPaymentCollections = normalizeOrderPaymentCollections;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3BsaXQtb3JkZXItcGF5bWVudC1zdGF0dXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3V0aWxzL3NwbGl0LW9yZGVyLXBheW1lbnQtc3RhdHVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHFEQUF1RDtBQUV2RCx5RkFBeUY7QUFRekYsNkVBQTZFO0FBQzdFLCtFQUErRTtBQUMvRSw2RUFBNkU7QUFDN0UsZ0ZBQWdGO0FBQ2hGLHNCQUFzQjtBQUN0QixNQUFNLDhCQUE4QixHQUFHO0lBQ3JDLDJCQUEyQjtJQUMzQixvQ0FBb0M7SUFDcEMsNENBQTRDO0lBQzVDLDBEQUEwRDtJQUMxRCw0Q0FBNEM7Q0FDN0MsQ0FBQTtBQUVNLE1BQU0sK0JBQStCLEdBQUcsQ0FBQyxNQUFnQixFQUFZLEVBQUU7SUFDNUUsT0FBTyxJQUFBLG1CQUFXLEVBQUMsQ0FBQyxHQUFHLE1BQU0sRUFBRSxHQUFHLDhCQUE4QixDQUFDLENBQUMsQ0FBQTtBQUNwRSxDQUFDLENBQUE7QUFGWSxRQUFBLCtCQUErQixtQ0FFM0M7QUFFRCw4RUFBOEU7QUFDOUUsNkVBQTZFO0FBQzdFLDRFQUE0RTtBQUM1RSwyRUFBMkU7QUFDM0Usa0ZBQWtGO0FBQzNFLE1BQU0sZ0NBQWdDLEdBQUcsQ0FHOUMsS0FBUSxFQUNMLEVBQUU7SUFDTCxNQUFNLGlCQUFpQixHQUFHLEtBQUssQ0FBQyxJQUFJLEVBQUUsa0JBQWtCLENBQUE7SUFFeEQsT0FBTyxLQUFLLENBQUMsSUFBSSxDQUFBO0lBRWpCLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxDQUFDO1FBQ3ZCLE9BQU8sS0FBSyxDQUFBO0lBQ2QsQ0FBQztJQUVELEtBQUssQ0FBQyxtQkFBbUIsR0FBRyxDQUFDLGlCQUFpQixDQUFDLENBQUE7SUFDL0MsS0FBSyxDQUFDLGNBQWMsR0FBRyxJQUFBLHVDQUFvQixFQUN6QyxLQUFrQyxDQUNuQyxDQUFBO0lBRUQsT0FBTyxLQUFLLENBQUE7QUFDZCxDQUFDLENBQUE7QUFuQlksUUFBQSxnQ0FBZ0Msb0NBbUI1QyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3BsaXQtb3JkZXItcGF5bWVudC1zdGF0dXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3V0aWxzL3NwbGl0LW9yZGVyLXBheW1lbnQtc3RhdHVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHFEQUF1RDtBQUV2RCx5RkFBeUY7QUFFekYsdUdBQXdHO0FBUXhHLDJFQUEyRTtBQUMzRSw4RUFBOEU7QUFDOUUsdUVBQXVFO0FBQ3ZFLCtFQUErRTtBQUMvRSw4Q0FBOEM7QUFDOUMsTUFBTSx5QkFBeUIsR0FBRztJQUNoQyxHQUFHO0lBQ0gsWUFBWTtJQUNaLG9CQUFvQjtJQUNwQixrQ0FBa0M7SUFDbEMsb0JBQW9CO0NBQ3JCLENBQUE7QUFFTSxNQUFNLCtCQUErQixHQUFHLENBQUMsTUFBZ0IsRUFBWSxFQUFFO0lBQzVFLE9BQU8sSUFBQSxtQkFBVyxFQUFDO1FBQ2pCLEdBQUcsTUFBTTtRQUNULEdBQUcseUJBQXlCLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyx1QkFBdUIsQ0FBQyxFQUFFLENBQUM7UUFDbkUsR0FBRyx5QkFBeUIsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLDJCQUEyQixDQUFDLEVBQUUsQ0FBQztLQUN4RSxDQUFDLENBQUE7QUFDSixDQUFDLENBQUE7QUFOWSxRQUFBLCtCQUErQixtQ0FNM0M7QUFFRCxnRkFBZ0Y7QUFDaEYsNkVBQTZFO0FBQzdFLDBDQUEwQztBQUNuQyxNQUFNLGdDQUFnQyxHQUFHLENBRzlDLEtBQVEsRUFDTCxFQUFFO0lBQ0wsTUFBTSxPQUFPLEdBQUcsQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUE7SUFDNUIsTUFBTSxrQkFBa0IsR0FBRyxJQUFBLDBEQUE4QixFQUFDLEtBQUssQ0FBQyxDQUFBO0lBRWhFLE9BQU8sS0FBSyxDQUFDLElBQUksQ0FBQTtJQUVqQixJQUFJLENBQUMsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLG1CQUFtQixFQUFFLENBQUM7UUFDM0MsT0FBTyxLQUFLLENBQUE7SUFDZCxDQUFDO0lBRUQsS0FBSyxDQUFDLG1CQUFtQixHQUFHLGtCQUFrQixDQUFBO0lBQzlDLEtBQUssQ0FBQyxjQUFjLEdBQUcsSUFBQSx1Q0FBb0IsRUFDekMsS0FBa0MsQ0FDbkMsQ0FBQTtJQUVELE9BQU8sS0FBSyxDQUFBO0FBQ2QsQ0FBQyxDQUFBO0FBcEJZLFFBQUEsZ0NBQWdDLG9DQW9CNUMifQ==

package/.medusa/server/src/api/vendor/payments/helpers.js

@@ -14,26 +14,32 @@ const refetchPayment = async (scope, paymentId, fields) => {
 exports.refetchPayment = refetchPayment;
 const validateSellerPayment = async (scope, sellerId, paymentId) => {
     const query = scope.resolve(utils_1.ContainerRegistrationKeys.QUERY);
-    // The payment collection is shared across all split orders of a cart, so it
-    // is not linked directly to any single order. Resolve the owning cart and
-    // check the seller owns one of that cart's orders.
+    // A payment is either an order's own, or the cart payment its orders share
+    // until it is captured, which is reachable only through the cart.
     const { data: [payment], } = await query.graph({
         entity: "payment",
         filters: { id: paymentId },
-        fields: ["id", "payment_collection.cart.id"],
+        fields: [
+            "id",
+            "payment_collection.order.id",
+            "payment_collection.cart.id",
+        ],
     });
-    const cartId = payment?.payment_collection?.cart?.id;
-    if (!cartId) {
-        throw new utils_1.MedusaError(utils_1.MedusaError.Types.NOT_FOUND, `Payment with id: ${paymentId} was not found`);
+    const paymentCollection = payment?.payment_collection;
+    let orderIds = [];
+    if (paymentCollection?.order?.id) {
+        orderIds = [paymentCollection.order.id];
+    }
+    else if (paymentCollection?.cart?.id) {
+        const { data: orderCartLinks } = await query.graph({
+            entity: "order_cart",
+            filters: { cart_id: paymentCollection.cart.id },
+            fields: ["order_id"],
+        });
+        orderIds = orderCartLinks
+            .map((link) => link.order_id)
+            .filter((id) => Boolean(id));
     }
-    const { data: orderCartLinks } = await query.graph({
-        entity: "order_cart",
-        filters: { cart_id: cartId },
-        fields: ["order_id"],
-    });
-    const orderIds = orderCartLinks
-        .map((link) => link.order_id)
-        .filter((id) => Boolean(id));
     if (!orderIds.length) {
         throw new utils_1.MedusaError(utils_1.MedusaError.Types.NOT_FOUND, `Payment with id: ${paymentId} was not found`);
     }
@@ -47,4 +53,4 @@ const validateSellerPayment = async (scope, sellerId, paymentId) => {
     }
 };
 exports.validateSellerPayment = validateSellerPayment;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9hcGkvdmVuZG9yL3BheW1lbnRzL2hlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EscURBR2tDO0FBRTNCLE1BQU0sY0FBYyxHQUFHLEtBQUssRUFDakMsS0FBc0IsRUFDdEIsU0FBaUIsRUFDakIsTUFBZ0IsRUFDaEIsRUFBRTtJQUNGLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsaUNBQXlCLENBQUMsS0FBSyxDQUFDLENBQUE7SUFFNUQsTUFBTSxFQUNKLElBQUksRUFBRSxDQUFDLE9BQU8sQ0FBQyxHQUNoQixHQUFHLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztRQUNwQixNQUFNLEVBQUUsU0FBUztRQUNqQixPQUFPLEVBQUUsRUFBRSxFQUFFLEVBQUUsU0FBUyxFQUFFO1FBQzFCLE1BQU07S0FDUCxDQUFDLENBQUE7SUFFRixPQUFPLE9BQU8sQ0FBQTtBQUNoQixDQUFDLENBQUE7QUFoQlksUUFBQSxjQUFjLGtCQWdCMUI7QUFFTSxNQUFNLHFCQUFxQixHQUFHLEtBQUssRUFDeEMsS0FBc0IsRUFDdEIsUUFBZ0IsRUFDaEIsU0FBaUIsRUFDakIsRUFBRTtJQUNGLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsaUNBQXlCLENBQUMsS0FBSyxDQUFDLENBQUE7SUFFNUQsNEVBQTRFO0lBQzVFLDBFQUEwRTtJQUMxRSxtREFBbUQ7SUFDbkQsTUFBTSxFQUNKLElBQUksRUFBRSxDQUFDLE9BQU8sQ0FBQyxHQUNoQixHQUFHLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztRQUNwQixNQUFNLEVBQUUsU0FBUztRQUNqQixPQUFPLEVBQUUsRUFBRSxFQUFFLEVBQUUsU0FBUyxFQUFFO1FBQzFCLE1BQU0sRUFBRSxDQUFDLElBQUksRUFBRSw0QkFBNEIsQ0FBQztLQUM3QyxDQUFDLENBQUE7SUFFRixNQUFNLE1BQU0sR0FDVixPQUdELEVBQUUsa0JBQWtCLEVBQUUsSUFBSSxFQUFFLEVBQUUsQ0FBQTtJQUUvQixJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7UUFDWixNQUFNLElBQUksbUJBQVcsQ0FDbkIsbUJBQVcsQ0FBQyxLQUFLLENBQUMsU0FBUyxFQUMzQixvQkFBb0IsU0FBUyxnQkFBZ0IsQ0FDOUMsQ0FBQTtJQUNILENBQUM7SUFFRCxNQUFNLEVBQUUsSUFBSSxFQUFFLGNBQWMsRUFBRSxHQUFHLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztRQUNqRCxNQUFNLEVBQUUsWUFBWTtRQUNwQixPQUFPLEVBQUUsRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFO1FBQzVCLE1BQU0sRUFBRSxDQUFDLFVBQVUsQ0FBQztLQUNyQixDQUFDLENBQUE7SUFFRixNQUFNLFFBQVEsR0FBRyxjQUFjO1NBQzVCLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUUsSUFBOEIsQ0FBQyxRQUFRLENBQUM7U0FDdkQsTUFBTSxDQUFDLENBQUMsRUFBRSxFQUFnQixFQUFFLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7SUFFNUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUNyQixNQUFNLElBQUksbUJBQVcsQ0FDbkIsbUJBQVcsQ0FBQyxLQUFLLENBQUMsU0FBUyxFQUMzQixvQkFBb0IsU0FBUyxnQkFBZ0IsQ0FDOUMsQ0FBQTtJQUNILENBQUM7SUFFRCxNQUFNLEVBQ0osSUFBSSxFQUFFLENBQUMsV0FBVyxDQUFDLEdBQ3BCLEdBQUcsTUFBTSxLQUFLLENBQUMsS0FBSyxDQUFDO1FBQ3BCLE1BQU0sRUFBRSxjQUFjO1FBQ3RCLE9BQU8sRUFBRSxFQUFFLFNBQVMsRUFBRSxRQUFRLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRTtRQUNwRCxNQUFNLEVBQUUsQ0FBQyxXQUFXLENBQUM7S0FDdEIsQ0FBQyxDQUFBO0lBRUYsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBQ2pCLE1BQU0sSUFBSSxtQkFBVyxDQUNuQixtQkFBVyxDQUFDLEtBQUssQ0FBQyxTQUFTLEVBQzNCLG9CQUFvQixTQUFTLGdCQUFnQixDQUM5QyxDQUFBO0lBQ0gsQ0FBQztBQUNILENBQUMsQ0FBQTtBQTlEWSxRQUFBLHFCQUFxQix5QkE4RGpDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9hcGkvdmVuZG9yL3BheW1lbnRzL2hlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EscURBR2tDO0FBRTNCLE1BQU0sY0FBYyxHQUFHLEtBQUssRUFDakMsS0FBc0IsRUFDdEIsU0FBaUIsRUFDakIsTUFBZ0IsRUFDaEIsRUFBRTtJQUNGLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsaUNBQXlCLENBQUMsS0FBSyxDQUFDLENBQUE7SUFFNUQsTUFBTSxFQUNKLElBQUksRUFBRSxDQUFDLE9BQU8sQ0FBQyxHQUNoQixHQUFHLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztRQUNwQixNQUFNLEVBQUUsU0FBUztRQUNqQixPQUFPLEVBQUUsRUFBRSxFQUFFLEVBQUUsU0FBUyxFQUFFO1FBQzFCLE1BQU07S0FDUCxDQUFDLENBQUE7SUFFRixPQUFPLE9BQU8sQ0FBQTtBQUNoQixDQUFDLENBQUE7QUFoQlksUUFBQSxjQUFjLGtCQWdCMUI7QUFFTSxNQUFNLHFCQUFxQixHQUFHLEtBQUssRUFDeEMsS0FBc0IsRUFDdEIsUUFBZ0IsRUFDaEIsU0FBaUIsRUFDakIsRUFBRTtJQUNGLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsaUNBQXlCLENBQUMsS0FBSyxDQUFDLENBQUE7SUFFNUQsMkVBQTJFO0lBQzNFLGtFQUFrRTtJQUNsRSxNQUFNLEVBQ0osSUFBSSxFQUFFLENBQUMsT0FBTyxDQUFDLEdBQ2hCLEdBQUcsTUFBTSxLQUFLLENBQUMsS0FBSyxDQUFDO1FBQ3BCLE1BQU0sRUFBRSxTQUFTO1FBQ2pCLE9BQU8sRUFBRSxFQUFFLEVBQUUsRUFBRSxTQUFTLEVBQUU7UUFDMUIsTUFBTSxFQUFFO1lBQ04sSUFBSTtZQUNKLDZCQUE2QjtZQUM3Qiw0QkFBNEI7U0FDN0I7S0FDRixDQUFDLENBQUE7SUFFRixNQUFNLGlCQUFpQixHQUNyQixPQVFELEVBQUUsa0JBQWtCLENBQUE7SUFFckIsSUFBSSxRQUFRLEdBQWEsRUFBRSxDQUFBO0lBRTNCLElBQUksaUJBQWlCLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxDQUFDO1FBQ2pDLFFBQVEsR0FBRyxDQUFDLGlCQUFpQixDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsQ0FBQTtJQUN6QyxDQUFDO1NBQU0sSUFBSSxpQkFBaUIsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUM7UUFDdkMsTUFBTSxFQUFFLElBQUksRUFBRSxjQUFjLEVBQUUsR0FBRyxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUM7WUFDakQsTUFBTSxFQUFFLFlBQVk7WUFDcEIsT0FBTyxFQUFFLEVBQUUsT0FBTyxFQUFFLGlCQUFpQixDQUFDLElBQUksQ0FBQyxFQUFFLEVBQUU7WUFDL0MsTUFBTSxFQUFFLENBQUMsVUFBVSxDQUFDO1NBQ3JCLENBQUMsQ0FBQTtRQUVGLFFBQVEsR0FBRyxjQUFjO2FBQ3RCLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUUsSUFBOEIsQ0FBQyxRQUFRLENBQUM7YUFDdkQsTUFBTSxDQUFDLENBQUMsRUFBRSxFQUFnQixFQUFFLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7SUFDOUMsQ0FBQztJQUVELElBQUksQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLENBQUM7UUFDckIsTUFBTSxJQUFJLG1CQUFXLENBQ25CLG1CQUFXLENBQUMsS0FBSyxDQUFDLFNBQVMsRUFDM0Isb0JBQW9CLFNBQVMsZ0JBQWdCLENBQzlDLENBQUE7SUFDSCxDQUFDO0lBRUQsTUFBTSxFQUNKLElBQUksRUFBRSxDQUFDLFdBQVcsQ0FBQyxHQUNwQixHQUFHLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztRQUNwQixNQUFNLEVBQUUsY0FBYztRQUN0QixPQUFPLEVBQUUsRUFBRSxTQUFTLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxRQUFRLEVBQUU7UUFDcEQsTUFBTSxFQUFFLENBQUMsV0FBVyxDQUFDO0tBQ3RCLENBQUMsQ0FBQTtJQUVGLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUNqQixNQUFNLElBQUksbUJBQVcsQ0FDbkIsbUJBQVcsQ0FBQyxLQUFLLENBQUMsU0FBUyxFQUMzQixvQkFBb0IsU0FBUyxnQkFBZ0IsQ0FDOUMsQ0FBQTtJQUNILENBQUM7QUFDSCxDQUFDLENBQUE7QUFyRVksUUFBQSxxQkFBcUIseUJBcUVqQyJ9

package/.medusa/server/src/api/vendor/sellers/select/route.js

@@ -17,8 +17,10 @@ const POST = async (req, res) => {
     if (!sellerMembers.length) {
         throw new utils_1.MedusaError(utils_1.MedusaError.Types.NOT_ALLOWED, "You are not a member of this seller account");
     }
-    req.session.seller_id = seller_id;
-    res.json({ success: true });
+    if (req.session?.auth_context) {
+        req.session.seller_id = seller_id;
+    }
+    res.json({ success: true, seller_id });
 };
 exports.POST = POST;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3ZlbmRvci9zZWxsZXJzL3NlbGVjdC9yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFJQSxxREFHa0M7QUFJM0IsTUFBTSxJQUFJLEdBQUcsS0FBSyxFQUN2QixHQUF1RCxFQUN2RCxHQUFtQixFQUNuQixFQUFFO0lBQ0YsTUFBTSxFQUFFLFNBQVMsRUFBRSxHQUFHLEdBQUcsQ0FBQyxhQUFhLENBQUE7SUFDdkMsTUFBTSxRQUFRLEdBQUcsR0FBRyxDQUFDLFlBQVksQ0FBQyxRQUFRLENBQUE7SUFFMUMsTUFBTSxLQUFLLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsaUNBQXlCLENBQUMsS0FBSyxDQUFDLENBQUE7SUFFaEUsTUFBTSxFQUFFLElBQUksRUFBRSxhQUFhLEVBQUUsR0FBRyxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQy9DO1FBQ0UsTUFBTSxFQUFFLGVBQWU7UUFDdkIsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLFdBQVcsRUFBRSxXQUFXLENBQUM7UUFDeEMsT0FBTyxFQUFFO1lBQ1AsU0FBUztZQUNULFNBQVMsRUFBRSxRQUFRO1NBQ3BCO0tBQ0YsRUFDRCxFQUFFLEtBQUssRUFBRSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsRUFBRSxDQUM1QixDQUFBO0lBRUQsSUFBSSxDQUFDLGFBQWEsQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUMxQixNQUFNLElBQUksbUJBQVcsQ0FDbkIsbUJBQVcsQ0FBQyxLQUFLLENBQUMsV0FBVyxFQUM3Qiw2Q0FBNkMsQ0FDOUMsQ0FBQTtJQUNILENBQUM7SUFFRCxHQUFHLENBQUMsT0FBTyxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUE7SUFFakMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFBO0FBQzdCLENBQUMsQ0FBQTtBQS9CWSxRQUFBLElBQUksUUErQmhCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3ZlbmRvci9zZWxsZXJzL3NlbGVjdC9yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFJQSxxREFHa0M7QUFJM0IsTUFBTSxJQUFJLEdBQUcsS0FBSyxFQUN2QixHQUF1RCxFQUN2RCxHQUFtQixFQUNuQixFQUFFO0lBQ0YsTUFBTSxFQUFFLFNBQVMsRUFBRSxHQUFHLEdBQUcsQ0FBQyxhQUFhLENBQUE7SUFDdkMsTUFBTSxRQUFRLEdBQUcsR0FBRyxDQUFDLFlBQVksQ0FBQyxRQUFRLENBQUE7SUFFMUMsTUFBTSxLQUFLLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsaUNBQXlCLENBQUMsS0FBSyxDQUFDLENBQUE7SUFFaEUsTUFBTSxFQUFFLElBQUksRUFBRSxhQUFhLEVBQUUsR0FBRyxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQy9DO1FBQ0UsTUFBTSxFQUFFLGVBQWU7UUFDdkIsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLFdBQVcsRUFBRSxXQUFXLENBQUM7UUFDeEMsT0FBTyxFQUFFO1lBQ1AsU0FBUztZQUNULFNBQVMsRUFBRSxRQUFRO1NBQ3BCO0tBQ0YsRUFDRCxFQUFFLEtBQUssRUFBRSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsRUFBRSxDQUM1QixDQUFBO0lBRUQsSUFBSSxDQUFDLGFBQWEsQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUMxQixNQUFNLElBQUksbUJBQVcsQ0FDbkIsbUJBQVcsQ0FBQyxLQUFLLENBQUMsV0FBVyxFQUM3Qiw2Q0FBNkMsQ0FDOUMsQ0FBQTtJQUNILENBQUM7SUFFRCxJQUFJLEdBQUcsQ0FBQyxPQUFPLEVBQUUsWUFBWSxFQUFFLENBQUM7UUFDOUIsR0FBRyxDQUFDLE9BQU8sQ0FBQyxTQUFTLEdBQUcsU0FBUyxDQUFBO0lBQ25DLENBQUM7SUFFRCxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFBO0FBQ3hDLENBQUMsQ0FBQTtBQWpDWSxRQUFBLElBQUksUUFpQ2hCIn0=

package/.medusa/server/src/modules/codegen/services/codegen-module-service.d.ts

@@ -8,6 +8,4 @@ export default class CodegenModuleService {
         onApplicationStart: () => Promise<void>;
     };
     onApplicationStart(): Promise<void>;
-    private detectPackageRunner_;
-    private runCodegen_;
 }

package/.medusa/server/src/modules/codegen/services/codegen-module-service.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const child_process_1 = require("child_process");
-const fs_1 = require("fs");
-const path_1 = require("path");
+const utils_1 = require("../utils");
 class CodegenModuleService {
     constructor({ logger }) {
         this.__hooks = {
@@ -16,36 +14,17 @@ class CodegenModuleService {
         if (process.env.NODE_ENV !== "development") {
             return;
         }
+        if (process.env.MERCUR_DEV_CODEGEN === "false") {
+            return;
+        }
         try {
-            await this.runCodegen_();
+            await (0, utils_1.runCodegen)(process.cwd());
         }
         catch (error) {
-            this.logger.warn(`Codegen failed: ${error}`);
+            const message = error instanceof Error ? error.message : String(error);
+            this.logger.warn(`Codegen failed: ${message}`);
         }
     }
-    detectPackageRunner_() {
-        const cwd = process.cwd();
-        const lockfiles = [
-            ["bun.lockb", "bunx"],
-            ["bun.lock", "bunx"],
-            ["pnpm-lock.yaml", "pnpm exec"],
-            ["yarn.lock", "yarn"],
-        ];
-        const runner = lockfiles.find(([file]) => (0, fs_1.existsSync)((0, path_1.join)(cwd, file)));
-        return `${runner ? runner[1] : "npx"} @mercurjs/cli codegen`;
-    }
-    runCodegen_() {
-        return new Promise((resolve, reject) => {
-            const command = this.detectPackageRunner_();
-            (0, child_process_1.exec)(command, { cwd: process.cwd() }, (error, _stdout, stderr) => {
-                if (error) {
-                    reject(stderr || error.message);
-                    return;
-                }
-                resolve();
-            });
-        });
-    }
 }
 exports.default = CodegenModuleService;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29kZWdlbi1tb2R1bGUtc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9tb2R1bGVzL2NvZGVnZW4vc2VydmljZXMvY29kZWdlbi1tb2R1bGUtc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLGlEQUFvQztBQUNwQywyQkFBK0I7QUFDL0IsK0JBQTJCO0FBRzNCLE1BQXFCLG9CQUFvQjtJQUdyQyxZQUFZLEVBQUUsTUFBTSxFQUFzQjtRQUkxQyxZQUFPLEdBQUc7WUFDTixrQkFBa0IsRUFBRSxLQUFLLElBQUksRUFBRTtnQkFDM0IsTUFBTSxJQUFJLENBQUMsa0JBQWtCLEVBQUUsQ0FBQTtZQUNuQyxDQUFDO1NBQ0osQ0FBQTtRQVBHLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFBO0lBQ3hCLENBQUM7SUFRRCxLQUFLLENBQUMsa0JBQWtCO1FBQ3BCLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLEtBQUssYUFBYSxFQUFFLENBQUM7WUFDekMsT0FBTTtRQUNWLENBQUM7UUFFRCxJQUFJLENBQUM7WUFDRCxNQUFNLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQTtRQUM1QixDQUFDO1FBQUMsT0FBTyxLQUFLLEVBQUUsQ0FBQztZQUNiLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLG1CQUFtQixLQUFLLEVBQUUsQ0FBQyxDQUFBO1FBQ2hELENBQUM7SUFDTCxDQUFDO0lBRU8sb0JBQW9CO1FBQ3hCLE1BQU0sR0FBRyxHQUFHLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQTtRQUN6QixNQUFNLFNBQVMsR0FBdUI7WUFDbEMsQ0FBQyxXQUFXLEVBQUUsTUFBTSxDQUFDO1lBQ3JCLENBQUMsVUFBVSxFQUFFLE1BQU0sQ0FBQztZQUNwQixDQUFDLGdCQUFnQixFQUFFLFdBQVcsQ0FBQztZQUMvQixDQUFDLFdBQVcsRUFBRSxNQUFNLENBQUM7U0FDeEIsQ0FBQTtRQUVELE1BQU0sTUFBTSxHQUFHLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLEVBQUUsQ0FBQyxJQUFBLGVBQVUsRUFBQyxJQUFBLFdBQUksRUFBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQ3RFLE9BQU8sR0FBRyxNQUFNLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyx3QkFBd0IsQ0FBQTtJQUNoRSxDQUFDO0lBRU8sV0FBVztRQUNmLE9BQU8sSUFBSSxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7WUFDbkMsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLG9CQUFvQixFQUFFLENBQUE7WUFDM0MsSUFBQSxvQkFBSSxFQUFDLE9BQU8sRUFBRSxFQUFFLEdBQUcsRUFBRSxPQUFPLENBQUMsR0FBRyxFQUFFLEVBQUUsRUFBRSxDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7Z0JBQzdELElBQUksS0FBSyxFQUFFLENBQUM7b0JBQ1IsTUFBTSxDQUFDLE1BQU0sSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUE7b0JBQy9CLE9BQU07Z0JBQ1YsQ0FBQztnQkFDRCxPQUFPLEVBQUUsQ0FBQTtZQUNiLENBQUMsQ0FBQyxDQUFBO1FBQ04sQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDO0NBQ0o7QUFsREQsdUNBa0RDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29kZWdlbi1tb2R1bGUtc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9tb2R1bGVzL2NvZGVnZW4vc2VydmljZXMvY29kZWdlbi1tb2R1bGUtc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUNBLG9DQUFxQztBQUVyQyxNQUFxQixvQkFBb0I7SUFHckMsWUFBWSxFQUFFLE1BQU0sRUFBc0I7UUFJMUMsWUFBTyxHQUFHO1lBQ04sa0JBQWtCLEVBQUUsS0FBSyxJQUFJLEVBQUU7Z0JBQzNCLE1BQU0sSUFBSSxDQUFDLGtCQUFrQixFQUFFLENBQUE7WUFDbkMsQ0FBQztTQUNKLENBQUE7UUFQRyxJQUFJLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQTtJQUN4QixDQUFDO0lBUUQsS0FBSyxDQUFDLGtCQUFrQjtRQUNwQixJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxLQUFLLGFBQWEsRUFBRSxDQUFDO1lBQ3pDLE9BQU07UUFDVixDQUFDO1FBRUQsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLGtCQUFrQixLQUFLLE9BQU8sRUFBRSxDQUFDO1lBQzdDLE9BQU07UUFDVixDQUFDO1FBRUQsSUFBSSxDQUFDO1lBQ0QsTUFBTSxJQUFBLGtCQUFVLEVBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUE7UUFDbkMsQ0FBQztRQUFDLE9BQU8sS0FBSyxFQUFFLENBQUM7WUFDYixNQUFNLE9BQU8sR0FBRyxLQUFLLFlBQVksS0FBSyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUE7WUFDdEUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsbUJBQW1CLE9BQU8sRUFBRSxDQUFDLENBQUE7UUFDbEQsQ0FBQztJQUNMLENBQUM7Q0FDSjtBQTdCRCx1Q0E2QkMifQ==

package/.medusa/server/src/modules/codegen/utils.d.ts

@@ -0,0 +1,4 @@
+export declare function resolveLocalCli(cwd: string): string | null;
+export declare function findNearestLockfileRunner(cwd: string): string;
+export declare function detectPackageRunner(cwd: string): string;
+export declare function runCodegen(cwd?: string, timeout?: number): Promise<void>;

package/.medusa/server/src/modules/codegen/utils.js

@@ -0,0 +1,79 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveLocalCli = resolveLocalCli;
+exports.findNearestLockfileRunner = findNearestLockfileRunner;
+exports.detectPackageRunner = detectPackageRunner;
+exports.runCodegen = runCodegen;
+const child_process_1 = require("child_process");
+const fs_1 = require("fs");
+const path_1 = require("path");
+function resolveLocalCli(cwd) {
+    try {
+        return require.resolve("@mercurjs/cli", { paths: [cwd] });
+    }
+    catch {
+        return null;
+    }
+}
+function findNearestLockfileRunner(cwd) {
+    let currentDir = cwd;
+    const lockfiles = [
+        ["bun.lockb", "bunx"],
+        ["bun.lock", "bunx"],
+        ["pnpm-lock.yaml", "pnpm dlx"],
+    ];
+    while (true) {
+        for (const [file, runner] of lockfiles) {
+            if ((0, fs_1.existsSync)((0, path_1.join)(currentDir, file))) {
+                return runner;
+            }
+        }
+        const parentDir = (0, path_1.dirname)(currentDir);
+        if (parentDir === currentDir) {
+            break;
+        }
+        currentDir = parentDir;
+    }
+    return "npx";
+}
+function detectPackageRunner(cwd) {
+    const userAgent = process.env.npm_config_user_agent;
+    if (userAgent) {
+        if (userAgent.startsWith("bun")) {
+            return "bunx";
+        }
+        if (userAgent.startsWith("pnpm")) {
+            return "pnpm dlx";
+        }
+        return "npx";
+    }
+    return findNearestLockfileRunner(cwd);
+}
+function runCodegen(cwd = process.cwd(), timeout = 15000) {
+    return new Promise((resolve, reject) => {
+        const localCli = resolveLocalCli(cwd);
+        if (localCli) {
+            (0, child_process_1.execFile)(process.execPath, [localCli, "codegen"], { cwd, timeout }, (error, _stdout, stderr) => {
+                if (error) {
+                    if (error.killed) {
+                        reject(new Error("Codegen timed out after 15s"));
+                        return;
+                    }
+                    reject(new Error(stderr || error.message));
+                    return;
+                }
+                resolve();
+            });
+            return;
+        }
+        const runner = detectPackageRunner(cwd);
+        (0, child_process_1.exec)(`${runner} @mercurjs/cli codegen`, { cwd }, (error, _stdout, stderr) => {
+            if (error) {
+                reject(new Error(stderr || error.message));
+                return;
+            }
+            resolve();
+        });
+    });
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvbW9kdWxlcy9jb2RlZ2VuL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBSUEsMENBTUM7QUFFRCw4REFzQkM7QUFFRCxrREFhQztBQUVELGdDQW9DQztBQXZGRCxpREFBOEM7QUFDOUMsMkJBQStCO0FBQy9CLCtCQUFvQztBQUVwQyxTQUFnQixlQUFlLENBQUMsR0FBVztJQUN2QyxJQUFJLENBQUM7UUFDRCxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsZUFBZSxFQUFFLEVBQUUsS0FBSyxFQUFFLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFBO0lBQzdELENBQUM7SUFBQyxNQUFNLENBQUM7UUFDTCxPQUFPLElBQUksQ0FBQTtJQUNmLENBQUM7QUFDTCxDQUFDO0FBRUQsU0FBZ0IseUJBQXlCLENBQUMsR0FBVztJQUNqRCxJQUFJLFVBQVUsR0FBRyxHQUFHLENBQUE7SUFDcEIsTUFBTSxTQUFTLEdBQXVCO1FBQ2xDLENBQUMsV0FBVyxFQUFFLE1BQU0sQ0FBQztRQUNyQixDQUFDLFVBQVUsRUFBRSxNQUFNLENBQUM7UUFDcEIsQ0FBQyxnQkFBZ0IsRUFBRSxVQUFVLENBQUM7S0FDakMsQ0FBQTtJQUVELE9BQU8sSUFBSSxFQUFFLENBQUM7UUFDVixLQUFLLE1BQU0sQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLElBQUksU0FBUyxFQUFFLENBQUM7WUFDckMsSUFBSSxJQUFBLGVBQVUsRUFBQyxJQUFBLFdBQUksRUFBQyxVQUFVLEVBQUUsSUFBSSxDQUFDLENBQUMsRUFBRSxDQUFDO2dCQUNyQyxPQUFPLE1BQU0sQ0FBQTtZQUNqQixDQUFDO1FBQ0wsQ0FBQztRQUNELE1BQU0sU0FBUyxHQUFHLElBQUEsY0FBTyxFQUFDLFVBQVUsQ0FBQyxDQUFBO1FBQ3JDLElBQUksU0FBUyxLQUFLLFVBQVUsRUFBRSxDQUFDO1lBQzNCLE1BQUs7UUFDVCxDQUFDO1FBQ0QsVUFBVSxHQUFHLFNBQVMsQ0FBQTtJQUMxQixDQUFDO0lBRUQsT0FBTyxLQUFLLENBQUE7QUFDaEIsQ0FBQztBQUVELFNBQWdCLG1CQUFtQixDQUFDLEdBQVc7SUFDM0MsTUFBTSxTQUFTLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBQTtJQUNuRCxJQUFJLFNBQVMsRUFBRSxDQUFDO1FBQ1osSUFBSSxTQUFTLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7WUFDOUIsT0FBTyxNQUFNLENBQUE7UUFDakIsQ0FBQztRQUNELElBQUksU0FBUyxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDO1lBQy9CLE9BQU8sVUFBVSxDQUFBO1FBQ3JCLENBQUM7UUFDRCxPQUFPLEtBQUssQ0FBQTtJQUNoQixDQUFDO0lBRUQsT0FBTyx5QkFBeUIsQ0FBQyxHQUFHLENBQUMsQ0FBQTtBQUN6QyxDQUFDO0FBRUQsU0FBZ0IsVUFBVSxDQUFDLE1BQWMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFFLFVBQWtCLEtBQUs7SUFDM0UsT0FBTyxJQUFJLE9BQU8sQ0FBQyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRTtRQUNuQyxNQUFNLFFBQVEsR0FBRyxlQUFlLENBQUMsR0FBRyxDQUFDLENBQUE7UUFDckMsSUFBSSxRQUFRLEVBQUUsQ0FBQztZQUNYLElBQUEsd0JBQVEsRUFDSixPQUFPLENBQUMsUUFBUSxFQUNoQixDQUFDLFFBQVEsRUFBRSxTQUFTLENBQUMsRUFDckIsRUFBRSxHQUFHLEVBQUUsT0FBTyxFQUFFLEVBQ2hCLENBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRTtnQkFDdkIsSUFBSSxLQUFLLEVBQUUsQ0FBQztvQkFDUixJQUFJLEtBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQzt3QkFDZixNQUFNLENBQUMsSUFBSSxLQUFLLENBQUMsNkJBQTZCLENBQUMsQ0FBQyxDQUFBO3dCQUNoRCxPQUFNO29CQUNWLENBQUM7b0JBQ0QsTUFBTSxDQUFDLElBQUksS0FBSyxDQUFDLE1BQU0sSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQTtvQkFDMUMsT0FBTTtnQkFDVixDQUFDO2dCQUNELE9BQU8sRUFBRSxDQUFBO1lBQ2IsQ0FBQyxDQUNKLENBQUE7WUFDRCxPQUFNO1FBQ1YsQ0FBQztRQUVELE1BQU0sTUFBTSxHQUFHLG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQ3ZDLElBQUEsb0JBQUksRUFDQSxHQUFHLE1BQU0sd0JBQXdCLEVBQ2pDLEVBQUUsR0FBRyxFQUFFLEVBQ1AsQ0FBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFO1lBQ3ZCLElBQUksS0FBSyxFQUFFLENBQUM7Z0JBQ1IsTUFBTSxDQUFDLElBQUksS0FBSyxDQUFDLE1BQU0sSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQTtnQkFDMUMsT0FBTTtZQUNWLENBQUM7WUFDRCxPQUFPLEVBQUUsQ0FBQTtRQUNiLENBQUMsQ0FDSixDQUFBO0lBQ0wsQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDIn0=

package/.medusa/server/src/modules/seller/repositories/order-group.js

@@ -15,6 +15,14 @@ const OPERATOR_MAP = {
     $like: "LIKE",
     $ilike: "ILIKE",
 };
+const SORTABLE_COLUMNS = ["display_id", "created_at", "updated_at"];
+const normalizeDirection = (value) => {
+    if (typeof value !== "string") {
+        return undefined;
+    }
+    const upper = value.toUpperCase();
+    return upper.startsWith("ASC") ? "ASC" : upper.startsWith("DESC") ? "DESC" : undefined;
+};
 class OrderGroupRepository extends utils_1.DALUtils.mikroOrmBaseRepositoryFactory(models_1.OrderGroup) {
     parseFilterValue(column, value, whereClauses, params) {
         if (!(0, utils_1.isObject)(value)) {
@@ -56,6 +64,8 @@ class OrderGroupRepository extends utils_1.DALUtils.mikroOrmBaseRepositoryFactor
         const knex = manager.getKnex();
         const params = [];
         const whereClauses = ["og.deleted_at IS NULL"];
+        const orderParams = [];
+        const orderClauses = [];
         if (filters.id) {
             const ids = Array.isArray(filters.id) ? filters.id : [filters.id];
             const placeholders = ids.map(() => "?").join(",");
@@ -83,24 +93,24 @@ class OrderGroupRepository extends utils_1.DALUtils.mikroOrmBaseRepositoryFactor
                 ? filters.seller_id
                 : [filters.seller_id];
             const placeholders = sellerIds.map(() => "?").join(",");
-            whereClauses.push(`oso.seller_id IN (${placeholders})`);
-            params.push(...sellerIds);
+            orderClauses.push(`fo_seller.seller_id IN (${placeholders})`);
+            orderParams.push(...sellerIds);
         }
         if (filters.status) {
             const statuses = Array.isArray(filters.status)
                 ? filters.status
                 : [filters.status];
             const placeholders = statuses.map(() => "?").join(",");
-            whereClauses.push(`o.status IN (${placeholders})`);
-            params.push(...statuses);
+            orderClauses.push(`fo.status IN (${placeholders})`);
+            orderParams.push(...statuses);
         }
         if (filters.sales_channel_id) {
             const salesChannelIds = Array.isArray(filters.sales_channel_id)
                 ? filters.sales_channel_id
                 : [filters.sales_channel_id];
             const placeholders = salesChannelIds.map(() => "?").join(",");
-            whereClauses.push(`o.sales_channel_id IN (${placeholders})`);
-            params.push(...salesChannelIds);
+            orderClauses.push(`fo.sales_channel_id IN (${placeholders})`);
+            orderParams.push(...salesChannelIds);
         }
         if (filters.created_at) {
             this.parseFilterValue("og.created_at", filters.created_at, whereClauses, params);
@@ -113,23 +123,33 @@ class OrderGroupRepository extends utils_1.DALUtils.mikroOrmBaseRepositoryFactor
             const searchPattern = `%${filters.q}%`;
             params.push(searchPattern, searchPattern);
         }
-        const orderByClauses = [];
-        if (orderBy.created_at) {
-            orderByClauses.push(`og.created_at ${orderBy.created_at}`);
+        // Order-level filters only decide which groups match. The aggregates below
+        // must still span every order in the group, so those filters live in an
+        // EXISTS subquery instead of the join the aggregates run over.
+        if (orderClauses.length > 0) {
+            whereClauses.push(`EXISTS (
+        SELECT 1
+        FROM order_group_order fogo
+        JOIN "order" fo ON fo.id = fogo.order_id
+        LEFT JOIN order_order_seller_seller fo_seller ON fo_seller.order_id = fo.id
+        WHERE fogo.order_group_id = og.id AND ${orderClauses.join(" AND ")}
+      )`);
+            params.push(...orderParams);
         }
-        if (orderBy.updated_at) {
-            orderByClauses.push(`og.updated_at ${orderBy.updated_at}`);
+        const orderByClauses = [];
+        for (const column of SORTABLE_COLUMNS) {
+            const direction = normalizeDirection(orderBy[column]);
+            if (direction) {
+                orderByClauses.push(`og.${column} ${direction}`);
+            }
         }
         if (orderByClauses.length === 0) {
             orderByClauses.push("og.created_at DESC");
         }
         const whereClause = whereClauses.join(" AND ");
         const countQuery = `
-      SELECT COUNT(DISTINCT og.id) as count
+      SELECT COUNT(*) as count
       FROM order_group og
-      LEFT JOIN order_group_order ogo ON ogo.order_group_id = og.id
-      LEFT JOIN "order" o ON o.id = ogo.order_id
-      LEFT JOIN order_order_seller_seller oso ON oso.order_id = o.id
       WHERE ${whereClause}
     `;
         let query = `
@@ -169,4 +189,4 @@ class OrderGroupRepository extends utils_1.DALUtils.mikroOrmBaseRepositoryFactor
     }
 }
 exports.OrderGroupRepository = OrderGroupRepository;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"order-group.js","sourceRoot":"","sources":["../../../../../../src/modules/seller/repositories/order-group.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"order-group.js","sourceRoot":"","sources":["../../../../../../src/modules/seller/repositories/order-group.ts"],"names":[],"mappings":"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"}

package/.medusa/server/src/patches/index.d.ts

@@ -1,7 +1,8 @@
+import { logger as medusaLogger } from "@medusajs/framework/logger";
 export type ApplyPatchesOptions = {
     /** Patch file names to skip, for adopters who need to opt out of one. */
     disabled?: string[];
-    logger?: Pick<Console, "info" | "warn">;
+    logger?: Pick<typeof medusaLogger, "debug" | "warn">;
 };
 export declare function applyMercurPatches(options?: ApplyPatchesOptions): void;
 export declare const DISABLED_PATCHES_ENV = "MERCUR_DISABLED_PATCHES";

package/.medusa/server/src/patches/index.js

@@ -7,6 +7,7 @@ exports.ensureMercurPatches = ensureMercurPatches;
 exports.assertPatchesDisabled = assertPatchesDisabled;
 const fs_1 = require("fs");
 const path_1 = require("path");
+const logger_1 = require("@medusajs/framework/logger");
 const apply_patch_1 = require("./apply-patch");
 const loader_1 = require("./loader");
 const manifest_1 = require("./manifest");
@@ -79,7 +80,7 @@ function applyToCopy(entry, copy, patchFilePath) {
 }
 function applyMercurPatches(options = {}) {
     const disabled = new Set(options.disabled ?? []);
-    const logger = options.logger ?? console;
+    const logger = options.logger ?? logger_1.logger;
     const patchedPackages = new Set();
     for (const entry of manifest_1.PATCHES) {
         if (disabled.has(entry.file)) {
@@ -100,7 +101,9 @@ function applyMercurPatches(options = {}) {
             throw new Error(`[mercur] Patch "${entry.file}" matched no installed copy of ` +
                 `${entry.package}. It corrects: ${entry.reason}`);
         }
-        logger.info(`[mercur] Applied patch "${entry.file}" to ${patchedCount} copy/copies of ` +
+        // Medusa's own loaders report what they registered at debug, which the
+        // default LOG_LEVEL ("http") keeps out of the console.
+        logger.debug(`[mercur] Applied patch "${entry.file}" to ${patchedCount} copy/copies of ` +
             `${entry.package}`);
         patchedPackages.add(entry.package);
     }
@@ -150,4 +153,4 @@ function assertPatchesDisabled(requested = []) {
 }
 var manifest_2 = require("./manifest");
 Object.defineProperty(exports, "PATCHES", { enumerable: true, get: function () { return manifest_2.PATCHES; } });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvcGF0Y2hlcy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUF5R0EsZ0RBc0RDO0FBWUQsd0RBT0M7QUFFRCxrREFNQztBQU9ELHNEQWVDO0FBaE5ELDJCQUE2QztBQUM3QywrQkFBMkI7QUFFM0IsK0NBQWdFO0FBQ2hFLHFDQUtpQjtBQUNqQix5Q0FBcUQ7QUFDckQsaUVBQStFO0FBQy9FLHVDQUF5QztBQUV6QywyRUFBMkU7QUFDM0UseUVBQXlFO0FBQ3pFLGlGQUFpRjtBQUNqRiw2RUFBNkU7QUFDN0UsZ0RBQWdEO0FBQ2hELEVBQUU7QUFDRixnRkFBZ0Y7QUFDaEYsaUZBQWlGO0FBQ2pGLDhCQUE4QjtBQUM5QixFQUFFO0FBQ0YsZ0ZBQWdGO0FBQ2hGLGdGQUFnRjtBQUNoRixnRUFBZ0U7QUFFaEUsTUFBTSxTQUFTLEdBQUcsSUFBQSxXQUFJLEVBQUMsU0FBUyxFQUFFLFNBQVMsQ0FBQyxDQUFBO0FBUTVDLFNBQVMsSUFBSSxDQUFDLEtBQWlCLEVBQUUsSUFBaUIsRUFBRSxNQUFjO0lBQ2hFLE1BQU0sSUFBSSxLQUFLLENBQ2IsbUJBQW1CLEtBQUssQ0FBQyxJQUFJLEtBQUssTUFBTSxHQUFHO1FBQ3pDLElBQUksS0FBSyxDQUFDLE9BQU8sSUFBSSxJQUFJLENBQUMsT0FBTyxJQUFJLFNBQVMsS0FBSyxJQUFJLENBQUMsR0FBRyxNQUFNO1FBQ2pFLGdCQUFnQixLQUFLLENBQUMsTUFBTSxJQUFJO1FBQ2hDLGlFQUFpRTtRQUNqRSx5RUFBeUUsQ0FDNUUsQ0FBQTtBQUNILENBQUM7QUFFRCxTQUFTLFdBQVcsQ0FBQyxVQUFrQixFQUFFLFlBQW9CO0lBQzNELE1BQU0sUUFBUSxHQUFHLElBQUEsV0FBSSxFQUFDLFVBQVUsRUFBRSxZQUFZLENBQUMsQ0FBQTtJQUMvQyxJQUFJLENBQUM7UUFDSCxPQUFPLElBQUEsaUJBQVksRUFBQyxRQUFRLENB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvcGF0Y2hlcy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUEyR0EsZ0RBd0RDO0FBWUQsd0RBT0M7QUFFRCxrREFNQztBQU9ELHNEQWVDO0FBcE5ELDJCQUE2QztBQUM3QywrQkFBMkI7QUFFM0IsdURBQW1FO0FBRW5FLCtDQUFnRTtBQUNoRSxxQ0FLaUI7QUFDakIseUNBQXFEO0FBQ3JELGlFQUErRTtBQUMvRSx1Q0FBeUM7QUFFekMsMkVBQTJFO0FBQzNFLHlFQUF5RTtBQUN6RSxpRkFBaUY7QUFDakYsNkVBQTZFO0FBQzdFLGdEQUFnRDtBQUNoRCxFQUFFO0FBQ0YsZ0ZBQWdGO0FBQ2hGLGlGQUFpRjtBQUNqRiw4QkFBOEI7QUFDOUIsRUFBRTtBQUNGLGdGQUFnRjtBQUNoRixnRkFBZ0Y7QUFDaEYsZ0VBQWdFO0FBRWhFLE1BQU0sU0FBUyxHQUFHLElBQUEsV0FBSSxFQUFDLFNBQVMsRUFBRSxTQUFTLENBQUMsQ0FBQTtBQVE1QyxTQUFTLElBQUksQ0FBQyxLQUFpQixFQUFFLElBQWlCLEVBQUUsTUFBYztJQUNoRSxNQUFNLElBQUksS0FBSyxDQUNiLG1CQUFtQixLQUFLLENBQUMsSUFBSSxLQUFLLE1BQU0sR0FBRztRQUN6QyxJQUFJLEtBQUssQ0FBQyxPQUFPLElBQUksSUFBSSxDQUFDLE9BQU8sSUFBSSxTQUFTLEtBQUssSUFBSSxDQUFDLEdBQUcsTUFBTTtRQUNqRSxnQkFBZ0IsS0FBSyxDQUFDLE1BQU0sSUFBSTtRQUNoQyxpRUFBaUU7UUFDakUseUVBQXlFLENBQzVFLENBQUE7QUFDSCxDQUFDO0FBRUQsU0FBUyxXQUFXLENBQUMsVUFBa0IsRUFBRSxZQUFvQjtJQUMzRCxNQUFNLFFBQVEsR0FBRyxJQUFBLFdBQUksRUFBQyxVQUFVLEVBQUUsWUFBWSxDQUFDLENBQUE7SUFDL0MsSUFBSSxDQUFDO1FBQ0gsT0FBTyxJQUFBLGlCQUFZ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