diff --git a/shop-routes/order.js b/shop-routes/order.js
index e750212c693b02d8d9a03b7d5f80f568a7846e0a..e49a609162f923b69b90b5c3726f1f5062a7f0a1 100644
--- a/shop-routes/order.js
+++ b/shop-routes/order.js
@@ -45,13 +45,19 @@ router.get('/history', isAuthenticated, async (req, res) => {
 // ดูรายละเอียดออเดอร์ (เฉพาะผู้ที่ Login)
 router.get('/detail/:orderId', async (req, res) => {
     try {
+        console.log("Checking Order Details...");
+        console.log("Session ID:", req.session.id);
+        console.log("Order ID:", req.params.orderId);
+
         const [orders] = await pool.query(
             'SELECT * FROM orders WHERE id = ? AND session_id = ?',
             [req.params.orderId, req.session.id]
         );
 
+        console.log("Orders Result:", orders);
+
         if (orders.length === 0) {
-            return res.status(404).send('Order not found');
+            return res.status(404).json({ message: 'Order not found' });
         }
 
         const order = orders[0];
@@ -65,10 +71,12 @@ router.get('/detail/:orderId', async (req, res) => {
             [req.params.orderId]
         );
 
-        res.render('order-detail', { order, items });
+        console.log("Order Items:", items);
+
+        res.json({ order, items });
     } catch (error) {
-        console.error(error);
-        res.status(500).send('Error fetching order details');
+        console.error("ERROR:", error);
+        res.status(500).json({ message: 'Something went wrong.', error: error.message });
     }
 });