diff --git a/shop-routes/cart.js b/shop-routes/cart.js
index 2fe64c9ac18238d5f7d3ad6432e52b33eafbf28f..1d409da04476b72d8d21f1eb8aa608f1d1e28d9a 100644
--- a/shop-routes/cart.js
+++ b/shop-routes/cart.js
@@ -3,13 +3,13 @@ const router = express.Router();
 const pool = require('../config/database');
 
 // ฟังก์ชันช่วยคำนวณราคารวม
-async function calculateTotal(userId) {
+async function calculateTotal(sessionId) {
     const [cartItems] = await pool.query(
         `SELECT cart_items.*, products.price 
          FROM cart_items 
          JOIN products ON cart_items.product_id = products.id 
-         WHERE cart_items.user_id = ?`,  // เปลี่ยนจาก session_id เป็น user_id
-        [userId]
+         WHERE cart_items.session_id = ?`,
+        [sessionId]
     );
     return cartItems.reduce((sum, item) => sum + (item.price * item.quantity), 0);
 }
@@ -21,10 +21,10 @@ router.get('/', async (req, res) => {
             `SELECT cart_items.*, products.name, products.price, products.stock
              FROM cart_items 
              JOIN products ON cart_items.product_id = products.id 
-             WHERE user_id = ?`,  // เปลี่ยนจาก session_id เป็น user_id
-            [req.session.user.id]
+             WHERE session_id = ?`,
+            [req.session.id]
         );
-        const total = await calculateTotal(req.session.user.id);
+        const total = await calculateTotal(req.session.id);
         res.render('cart', { cartItems, total });
     } catch (error) {
         console.error(error);
@@ -32,7 +32,6 @@ router.get('/', async (req, res) => {
     }
 });
 
-// เพิ่มสินค้าลงตะกร้า
 // เพิ่มสินค้าลงตะกร้า
 router.post('/add', async (req, res) => {
     const { productId, quantity } = req.body;
@@ -52,7 +51,7 @@ router.post('/add', async (req, res) => {
         // ตรวจสอบว่าสินค้านี้มีอยู่ในตะกร้าหรือยัง
         const [[existingItem]] = await pool.query(
             'SELECT id, quantity FROM cart_items WHERE session_id = ? AND product_id = ?',
-            [req.session.user.id, productId]
+            [req.session.id, productId]
         );
 
         if (existingItem) {
@@ -89,8 +88,8 @@ router.post('/update', async (req, res) => {
             `SELECT cart_items.*, products.price, products.stock 
              FROM cart_items 
              JOIN products ON cart_items.product_id = products.id 
-             WHERE cart_items.id = ? AND cart_items.user_id = ?`,  // เปลี่ยนจาก session_id เป็น user_id
-            [cartItemId, req.session.user.id]
+             WHERE cart_items.id = ? AND cart_items.session_id = ?`,
+            [cartItemId, req.session.id]
         );
 
         if (!cartItem) {
@@ -102,11 +101,11 @@ router.post('/update', async (req, res) => {
         }
 
         await pool.query(
-            'UPDATE cart_items SET quantity = ? WHERE id = ? AND user_id = ?',
-            [parseInt(quantity), cartItemId, req.session.user.id]
+            'UPDATE cart_items SET quantity = ? WHERE id = ? AND session_id = ?',
+            [parseInt(quantity), cartItemId, req.session.id]
         );
 
-        const total = await calculateTotal(req.session.user.id);
+        const total = await calculateTotal(req.session.id);
         res.json({ total });
     } catch (error) {
         console.error(error);
@@ -119,8 +118,8 @@ router.post('/remove', async (req, res) => {
     const { cartItemId } = req.body;
     try {
         await pool.query(
-            'DELETE FROM cart_items WHERE id = ? AND user_id = ?',
-            [cartItemId, req.session.user.id]  // ใช้ user_id แทน session_id
+            'DELETE FROM cart_items WHERE id = ? AND session_id = ?',
+            [cartItemId, req.session.id]
         );
         res.redirect('/cart');
     } catch (error) {
@@ -131,9 +130,9 @@ router.post('/remove', async (req, res) => {
 
 router.get('/cart', (req, res) => {
     const cartItems = req.session.cart || [];
-    const editingItemId = req.session.editingItemId || null;
+    const editingItemId = req.session.editingItemId || null; // ถ้าไม่มีการแก้ไขก็เป็น null
+
     res.render('cart', { cartItems, total: calculateTotal(cartItems), editingItemId });
 });
 
-
 module.exports = router;
\ No newline at end of file