order-management 0.0.12 → 0.0.14

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

@@ -123,7 +123,7 @@ const ReturnsPage = () => {
           className: "h-9 rounded-md border border-ui-border-base bg-transparent px-3 text-sm text-ui-fg-base outline-none transition focus:ring-2 focus:ring-ui-fg-interactive md:max-w-xs",
           children: [
             /* @__PURE__ */ jsxRuntime.jsx("option", { value: "all", children: "All Statuses" }),
-            availableStatuses.map((status) => /* @__PURE__ */ jsxRuntime.jsx("option", { value: status, children: status.replace("_", " ").toUpperCase() }, status))
+            availableStatuses.map((status) => /* @__PURE__ */ jsxRuntime.jsx("option", { value: status, children: status.replace(/_/g, " ").toUpperCase() }, status))
           ]
         }
       ) })
@@ -166,11 +166,26 @@ const ReturnsPage = () => {
               {
                 size: "2xsmall",
                 className: `uppercase ${getStatusBadgeClass$1(returnOrder.status)}`,
-                children: returnOrder.status.replace("_", " ")
+                children: returnOrder.status.replace(/_/g, " ")
               }
             ) }),
-            /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: returnOrder.refund_amount ? `$${Number(returnOrder.refund_amount).toFixed(2)}` : "—" }),
-            /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: new Date(returnOrder.created_at).toLocaleString() }),
+            /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: (() => {
+              const amount = returnOrder.refund_amount;
+              if (amount == null || amount === void 0) {
+                return "—";
+              }
+              const displayAmount = Number(amount) / 100;
+              const currency = returnOrder.currency_code || "$";
+              return `${currency}${displayAmount.toFixed(2)}`;
+            })() }),
+            /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: new Date(returnOrder.created_at).toLocaleDateString("en-US", {
+              year: "numeric",
+              month: "short",
+              day: "numeric",
+              hour: "numeric",
+              minute: "2-digit",
+              hour12: true
+            }) }),
             /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4", children: /* @__PURE__ */ jsxRuntime.jsx(
               ui.Button,
               {

package/.medusa/server/src/admin/index.mjs

@@ -122,7 +122,7 @@ const ReturnsPage = () => {
           className: "h-9 rounded-md border border-ui-border-base bg-transparent px-3 text-sm text-ui-fg-base outline-none transition focus:ring-2 focus:ring-ui-fg-interactive md:max-w-xs",
           children: [
             /* @__PURE__ */ jsx("option", { value: "all", children: "All Statuses" }),
-            availableStatuses.map((status) => /* @__PURE__ */ jsx("option", { value: status, children: status.replace("_", " ").toUpperCase() }, status))
+            availableStatuses.map((status) => /* @__PURE__ */ jsx("option", { value: status, children: status.replace(/_/g, " ").toUpperCase() }, status))
           ]
         }
       ) })
@@ -165,11 +165,26 @@ const ReturnsPage = () => {
               {
                 size: "2xsmall",
                 className: `uppercase ${getStatusBadgeClass$1(returnOrder.status)}`,
-                children: returnOrder.status.replace("_", " ")
+                children: returnOrder.status.replace(/_/g, " ")
               }
             ) }),
-            /* @__PURE__ */ jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: returnOrder.refund_amount ? `$${Number(returnOrder.refund_amount).toFixed(2)}` : "—" }),
-            /* @__PURE__ */ jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: new Date(returnOrder.created_at).toLocaleString() }),
+            /* @__PURE__ */ jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: (() => {
+              const amount = returnOrder.refund_amount;
+              if (amount == null || amount === void 0) {
+                return "—";
+              }
+              const displayAmount = Number(amount) / 100;
+              const currency = returnOrder.currency_code || "$";
+              return `${currency}${displayAmount.toFixed(2)}`;
+            })() }),
+            /* @__PURE__ */ jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: new Date(returnOrder.created_at).toLocaleDateString("en-US", {
+              year: "numeric",
+              month: "short",
+              day: "numeric",
+              hour: "numeric",
+              minute: "2-digit",
+              hour12: true
+            }) }),
             /* @__PURE__ */ jsx("td", { className: "px-4 py-4", children: /* @__PURE__ */ jsx(
               Button,
               {

package/.medusa/server/src/api/admin/returns/[id]/route.js

@@ -1,55 +1,56 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GET = void 0;
-const utils_1 = require("@medusajs/framework/utils");
 const GET = async (req, res) => {
     const { id } = req.params;
     if (!id) {
         res.status(400).json({ message: "Return ID is required" });
         return;
     }
-    const remoteQuery = req.scope.resolve(utils_1.ContainerRegistrationKeys.REMOTE_QUERY);
     try {
-        // Query orders with returns to find the specific return
-        const queryObject = (0, utils_1.remoteQueryObjectFromString)({
-            entryPoint: "order",
-            fields: [
-                "id",
-                "email",
-                "created_at",
-                "updated_at",
-                "status",
-                "currency_code",
-                "total",
-                "subtotal",
-                "tax_total",
-                "shipping_total",
-                "discount_total",
-                "customer.id",
-                "customer.email",
-                "customer.first_name",
-                "customer.last_name",
-                "shipping_address.*",
-                "billing_address.*",
-                "returns.id",
-                "returns.status",
-                "returns.created_at",
-                "returns.updated_at",
-                "returns.items.*",
-                "returns.items.item.*",
-                "returns.shipping_method.*",
-                "returns.refund_amount",
-                "returns.metadata",
-                "returns.reason",
-                "returns.note",
-            ],
-        });
-        const orders = await remoteQuery(queryObject);
-        const orderArray = Array.isArray(orders) ? orders : [orders];
+        // Resolve OrderModuleService
+        const orderService = req.scope.resolve("order");
+        if (!orderService) {
+            res.status(500).json({
+                message: "Order service is not available. Please ensure the Medusa framework is properly configured.",
+            });
+            return;
+        }
+        // Fetch orders with returns relation using OrderService
+        // This avoids the MikroORM join strategy error
+        let orders = [];
+        // Try listOrders method (common in Medusa v2)
+        if (typeof orderService.listOrders === "function") {
+            const result = await orderService.listOrders({}, // No filters - we'll search through all orders
+            {
+                relations: ["returns", "returns.items"],
+                take: 1000, // Fetch a large batch to find the return
+                skip: 0,
+            });
+            // listOrders might return [orders, count] or just orders
+            if (Array.isArray(result) && result.length === 2 && typeof result[1] === "number") {
+                orders = Array.isArray(result[0]) ? result[0] : result[0] ? [result[0]] : [];
+            }
+            else {
+                orders = Array.isArray(result) ? result : result ? [result] : [];
+            }
+        }
+        else if (typeof orderService.listAndCount === "function") {
+            // Fallback to listAndCount if available
+            const result = await orderService.listAndCount({}, {
+                relations: ["returns", "returns.items"],
+                take: 1000,
+                skip: 0,
+            });
+            orders = Array.isArray(result[0]) ? result[0] : result[0] ? [result[0]] : [];
+        }
+        else {
+            throw new Error("OrderService does not have listOrders or listAndCount method");
+        }
         // Find the return in any order
         let foundReturn = null;
         let parentOrder = null;
-        for (const order of orderArray) {
+        for (const order of orders) {
             if (order && typeof order === "object" && "returns" in order) {
                 const orderReturns = Array.isArray(order.returns)
                     ? order.returns
@@ -93,7 +94,7 @@ const GET = async (req, res) => {
                     tax_total: orderData?.tax_total,
                     shipping_total: orderData?.shipping_total,
                     discount_total: orderData?.discount_total,
-                    customer: orderData?.customer,
+                    customer_id: orderData?.customer_id,
                     shipping_address: orderData?.shipping_address,
                     billing_address: orderData?.billing_address,
                 },
@@ -101,6 +102,7 @@ const GET = async (req, res) => {
         });
     }
     catch (error) {
+        console.error("Error retrieving return details:", error);
         res.status(500).json({
             message: error instanceof Error
                 ? error.message
@@ -109,4 +111,4 @@ const GET = async (req, res) => {
     }
 };
 exports.GET = GET;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL3JldHVybnMvW2lkXS9yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSxxREFHa0M7QUFJM0IsTUFBTSxHQUFHLEdBQUcsS0FBSyxFQUN0QixHQUFrQixFQUNsQixHQUFtQixFQUNuQixFQUFFO0lBQ0YsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUE7SUFFekIsSUFBSSxDQUFDLEVBQUUsRUFBRSxDQUFDO1FBQ1IsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsQ0FBQyxDQUFBO1FBQzFELE9BQU07SUFDUixDQUFDO0lBRUQsTUFBTSxXQUFXLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQ25DLGlDQUF5QixDQUFDLFlBQVksQ0FDdkMsQ0FBQTtJQUVELElBQUksQ0FBQztRQUNILHdEQUF3RDtRQUN4RCxNQUFNLFdBQVcsR0FBRyxJQUFBLG1DQUEyQixFQUFDO1lBQzlDLFVBQVUsRUFBRSxPQUFPO1lBQ25CLE1BQU0sRUFBRTtnQkFDTixJQUFJO2dCQUNKLE9BQU87Z0JBQ1AsWUFBWTtnQkFDWixZQUFZO2dCQUNaLFFBQVE7Z0JBQ1IsZUFBZTtnQkFDZixPQUFPO2dCQUNQLFVBQVU7Z0JBQ1YsV0FBVztnQkFDWCxnQkFBZ0I7Z0JBQ2hCLGdCQUFnQjtnQkFDaEIsYUFBYTtnQkFDYixnQkFBZ0I7Z0JBQ2hCLHFCQUFxQjtnQkFDckIsb0JBQW9CO2dCQUNwQixvQkFBb0I7Z0JBQ3BCLG1CQUFtQjtnQkFDbkIsWUFBWTtnQkFDWixnQkFBZ0I7Z0JBQ2hCLG9CQUFvQjtnQkFDcEIsb0JBQW9CO2dCQUNwQixpQkFBaUI7Z0JBQ2pCLHNCQUFzQjtnQkFDdEIsMkJBQTJCO2dCQUMzQix1QkFB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL3JldHVybnMvW2lkXS9yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFFTyxNQUFNLEdBQUcsR0FBRyxLQUFLLEVBQ3RCLEdBQWtCLEVBQ2xCLEdBQW1CLEVBQ25CLEVBQUU7SUFDRixNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQTtJQUV6QixJQUFJLENBQUMsRUFBRSxFQUFFLENBQUM7UUFDUixHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxDQUFDLENBQUE7UUFDMUQsT0FBTTtJQUNSLENBQUM7SUFFRCxJQUFJLENBQUM7UUFDSCw2QkFBNkI7UUFDN0IsTUFBTSxZQUFZLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUE7UUFFL0MsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO1lBQ2xCLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDO2dCQUNuQixPQUFPLEVBQUUsNEZBQTRGO2FBQ3RHLENBQUMsQ0FBQTtZQUNGLE9BQU07UUFDUixDQUFDO1FBRUQsd0RBQXdEO1FBQ3hELCtDQUErQztRQUMvQyxJQUFJLE1BQU0sR0FBYyxFQUFFLENBQUE7UUFFMUIsOENBQThDO1FBQzlDLElBQUksT0FBUSxZQUF5QyxDQUFDLFVBQVUsS0FBSyxVQUFVLEVBQUUsQ0FBQztZQUNoRixNQUFNLE1BQU0sR0FBRyxNQUFPLFlBS3BCLENBQUMsVUFBVSxDQUNYLEVBQUUsRUFBRSwrQ0FBK0M7WUFDbkQ7Z0JBQ0UsU0FBUyxFQUFFLENBQUMsU0FBUyxFQUFFLGVBQWUsQ0FBQztnQkFDdkMsSUFBSSxFQUFFLElBQUksRUFBRSx5Q0FBeUM7Z0JBQ3JE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

package/.medusa/server/src/api/admin/returns/route.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GET = void 0;
-const utils_1 = require("@medusajs/framework/utils");
 const validators_1 = require("./validators");
 const GET = async (req, res) => {
     // Parse query - Medusa framework rejects order_direction, so we use default DESC
@@ -31,72 +30,71 @@ const GET = async (req, res) => {
     }
     // Use DESC as default sort direction (Medusa framework rejects order_direction parameter)
     const sortDirection = "DESC";
-    const remoteQuery = req.scope.resolve(utils_1.ContainerRegistrationKeys.REMOTE_QUERY);
+    // Use OrderService to fetch orders with returns relation
+    // This is the recommended Medusa approach and avoids MikroORM join strategy errors
     try {
-        // Build filters for orders
-        // Note: We only filter by order_id directly. Customer email and other filters
-        // are applied in post-processing because RemoteQuery doesn't support nested filters
-        const filters = {};
-        // Filter by order_id if provided
+        // Resolve OrderModuleService
+        const orderService = req.scope.resolve("order");
+        if (!orderService) {
+            res.status(500).json({
+                message: "Order service is not available. Please ensure the Medusa framework is properly configured.",
+            });
+            return;
+        }
+        // Build order-level filters (applied to OrderService query)
+        const orderFilters = {};
         if (query.order_id) {
-            filters.id = [query.order_id];
+            orderFilters.id = query.order_id;
+        }
+        if (query.q?.startsWith("order_")) {
+            orderFilters.id = query.q;
         }
-        // Search query - if it looks like an order ID, filter by it
-        if (query.q) {
-            const searchTerm = query.q.trim();
-            if (searchTerm.startsWith("order_")) {
-                filters.id = [searchTerm];
+        // Fetch orders with returns relation
+        // Note: We fetch more orders than needed since we filter returns after extraction
+        // This ensures we get enough returns after filtering
+        // Try different method names that OrderService might have
+        let orders = [];
+        let orderCount = 0;
+        // Try listOrders method (common in Medusa v2)
+        if (typeof orderService.listOrders === "function") {
+            const result = await orderService.listOrders(orderFilters, {
+                relations: ["returns", "returns.items"],
+                take: Math.max(query.limit * 3, 100),
+                skip: 0,
+            });
+            // listOrders might return [orders, count] or just orders
+            if (Array.isArray(result) && result.length === 2 && typeof result[1] === "number") {
+                orders = Array.isArray(result[0]) ? result[0] : result[0] ? [result[0]] : [];
+                orderCount = result[1];
+            }
+            else {
+                orders = Array.isArray(result) ? result : result ? [result] : [];
+                orderCount = orders.length;
             }
         }
-        // Build the query object
-        // Note: We query all orders with returns and filter returns in post-processing
-        // because Medusa's RemoteQuery doesn't support nested filters like returns.status
-        const queryObject = (0, utils_1.remoteQueryObjectFromString)({
-            entryPoint: "order",
-            fields: [
-                "id",
-                "email",
-                "created_at",
-                "updated_at",
-                "customer.id",
-                "customer.email",
-                "returns.id",
-                "returns.status",
-                "returns.created_at",
-                "returns.updated_at",
-                "returns.items.*",
-                "returns.shipping_method.*",
-                "returns.refund_amount",
-                "returns.metadata",
-                "returns.reason",
-                "returns.note",
-                "returns.received_at",
-            ],
-            filters: Object.keys(filters).length > 0 ? filters : undefined,
-            // Don't paginate at the order level - we'll paginate returns after filtering
-        });
-        // Execute query
-        let orders;
-        try {
-            orders = await remoteQuery(queryObject);
+        else if (typeof orderService.listAndCount === "function") {
+            // Fallback to listAndCount if available
+            const result = await orderService.listAndCount(orderFilters, {
+                relations: ["returns", "returns.items"],
+                take: Math.max(query.limit * 3, 100),
+                skip: 0,
+            });
+            orders = Array.isArray(result[0]) ? result[0] : result[0] ? [result[0]] : [];
+            orderCount = result[1];
         }
-        catch (queryError) {
-            console.error("RemoteQuery error:", queryError);
-            throw new Error(`Failed to query returns: ${queryError instanceof Error ? queryError.message : "Unknown error"}`);
+        else {
+            // If neither method exists, throw an error
+            throw new Error("OrderService does not have listOrders or listAndCount method. " +
+                "Available methods: " + Object.keys(orderService).join(", "));
         }
-        // Extract returns from orders and flatten the structure
-        const returns = [];
-        const orderArray = Array.isArray(orders) ? orders : orders ? [orders] : [];
-        for (const order of orderArray) {
-            if (!order || typeof order !== "object") {
+        console.log(`[Returns API] Fetched ${orders.length} orders (${orderCount} total)`);
+        // Extract returns from orders and apply return-level filters
+        const allReturns = [];
+        for (const order of orders) {
+            if (!order || typeof order !== "object" || !("returns" in order)) {
                 continue;
             }
-            const orderData = order;
-            // Check if order has returns - handle both array and single return cases
-            if (!("returns" in orderData)) {
-                continue;
-            }
-            const orderReturnsRaw = orderData.returns;
+            const orderReturnsRaw = order.returns;
             const orderReturns = Array.isArray(orderReturnsRaw)
                 ? orderReturnsRaw
                 : orderReturnsRaw
@@ -110,69 +108,71 @@ const GET = async (req, res) => {
                     continue;
                 }
                 const returnData = returnItem;
-                // Apply customer email filter if provided
-                if (query.customer_email) {
-                    const customerData = orderData.customer;
-                    const orderEmail = orderData.email || "";
-                    const customerEmail = customerData?.email || orderEmail;
-                    if (!customerEmail
-                        .toLowerCase()
-                        .includes(query.customer_email.toLowerCase())) {
+                // Transform order to typed structure (needed for filters)
+                // Note: Order entity doesn't have direct 'customer' relation in Medusa v2
+                // Use customer_id and email fields instead
+                const orderData = order;
+                // Apply return-level filters
+                // Filter by return status
+                if (query.status && returnData.status !== query.status) {
+                    continue;
+                }
+                // Filter by return ID if search query starts with "return_"
+                if (query.q?.startsWith("return_")) {
+                    if (returnData.id !== query.q) {
                         continue;
                     }
                 }
-                // Apply search filter if provided
-                if (query.q) {
+                else if (query.q && !query.q.startsWith("order_")) {
+                    // General search: check return ID, order ID, and customer email
                     const searchTerm = query.q.toLowerCase();
                     const returnId = String(returnData.id || "").toLowerCase();
                     const orderId = String(orderData.id || "").toLowerCase();
-                    const customerData = orderData.customer;
-                    const customerEmail = String(customerData?.email ||
-                        orderData.email ||
-                        "").toLowerCase();
+                    const customerEmail = String(orderData.email || "").toLowerCase();
                     if (!returnId.includes(searchTerm) &&
                         !orderId.includes(searchTerm) &&
                         !customerEmail.includes(searchTerm)) {
                         continue;
                     }
                 }
-                // Apply status filter
-                if (query.status && returnData.status !== query.status) {
-                    continue;
+                // Filter by customer email
+                if (query.customer_email) {
+                    const customerEmail = orderData.email || "";
+                    if (!customerEmail.toLowerCase().includes(query.customer_email.toLowerCase())) {
+                        continue;
+                    }
                 }
-                // Apply date range filter
-                if (query.created_at) {
-                    const returnCreatedAt = returnData.created_at
+                // Date filtering on return creation
+                if (query.created_at?.gte || query.created_at?.lte) {
+                    const returnDate = returnData.created_at
                         ? new Date(returnData.created_at)
                         : null;
-                    if (query.created_at.gte && returnCreatedAt) {
-                        if (returnCreatedAt < new Date(query.created_at.gte)) {
+                    if (query.created_at.gte && returnDate) {
+                        if (returnDate < new Date(query.created_at.gte)) {
                             continue;
                         }
                     }
-                    if (query.created_at.lte && returnCreatedAt) {
-                        if (returnCreatedAt > new Date(query.created_at.lte)) {
+                    if (query.created_at.lte && returnDate) {
+                        if (returnDate > new Date(query.created_at.lte)) {
                             continue;
                         }
                     }
                 }
-                // Build return object with order context
-                const customerData = orderData.customer;
-                returns.push({
+                allReturns.push({
                     ...returnData,
                     order_id: orderData.id,
                     order_email: orderData.email,
-                    customer_id: customerData?.id,
-                    customer_email: customerData?.email || orderData.email,
+                    order_display_id: orderData.display_id,
+                    customer_id: orderData.customer_id,
+                    customer_email: orderData.email, // Use order email as customer email
+                    currency_code: orderData.currency_code, // Include currency code from order
                 });
             }
         }
+        console.log(`[Returns API] Extracted ${allReturns.length} returns after filtering`);
         // Sort returns
         const sortField = query.order || "created_at";
-        returns.sort((a, b) => {
-            if (typeof a !== "object" || a === null || typeof b !== "object" || b === null) {
-                return 0;
-            }
+        allReturns.sort((a, b) => {
             const aVal = a[sortField];
             const bVal = b[sortField];
             if (aVal === undefined && bVal === undefined)
@@ -181,20 +181,29 @@ const GET = async (req, res) => {
                 return 1;
             if (bVal === undefined)
                 return -1;
+            // Handle dates
             if (aVal instanceof Date && bVal instanceof Date) {
-                // Always sort DESC (newest first) since Medusa framework rejects order_direction
-                return bVal.getTime() - aVal.getTime();
+                return sortDirection === "DESC"
+                    ? bVal.getTime() - aVal.getTime()
+                    : aVal.getTime() - bVal.getTime();
             }
+            // Handle strings
             if (typeof aVal === "string" && typeof bVal === "string") {
-                // Always sort DESC (newest first) since Medusa framework rejects order_direction
-                return bVal.localeCompare(aVal);
+                return sortDirection === "DESC"
+                    ? bVal.localeCompare(aVal)
+                    : aVal.localeCompare(bVal);
+            }
+            // Handle numbers
+            if (typeof aVal === "number" && typeof bVal === "number") {
+                return sortDirection === "DESC" ? bVal - aVal : aVal - bVal;
             }
             return 0;
         });
-        // Get total count before pagination
-        const totalCount = returns.length;
+        // Get total count after filtering
+        const totalCount = allReturns.length;
         // Apply pagination
-        const paginatedReturns = returns.slice(query.offset, query.offset + query.limit);
+        const paginatedReturns = allReturns.slice(query.offset, query.offset + query.limit);
+        console.log(`[Returns API] Returning ${paginatedReturns.length} returns (page ${Math.floor(query.offset / query.limit) + 1}, total: ${totalCount})`);
         res.status(200).json({
             returns: paginatedReturns,
             count: totalCount,
@@ -213,4 +222,4 @@ const GET = async (req, res) => {
     }
 };
 exports.GET = GET;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../../src/api/admin/returns/route.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../../src/api/admin/returns/route.ts"],"names":[],"mappings":"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"}