diff --git a/backend/controllers/couponController.js b/backend/controllers/couponController.js
index 72da1fc6..cce33a4d 100644
--- a/backend/controllers/couponController.js
+++ b/backend/controllers/couponController.js
@@ -15,3 +15,15 @@ export const validCoupon = async (req, res) => {
         res.status(500).json({ message: error.message })
     }
 }
+
+export const createCoupon = async (req, res) => {
+    try {
+        const { couponCode, discount, expiryDate } = req.body
+
+        const coupon = await Coupon.create({ couponCode, discount, expiryDate })
+
+        res.status(201).json({ coupon })
+    } catch (error) {
+        res.status(409).json({ message: error.message })
+    }
+}
diff --git a/backend/controllers/orderController.js b/backend/controllers/orderController.js
index 0b5aa9a3..513e90c4 100644
--- a/backend/controllers/orderController.js
+++ b/backend/controllers/orderController.js
@@ -67,8 +67,8 @@ export const getAllOrders = async (req, res) => {
     console.log('shopId', shopId)
     try {
         const orders = shopId
-            ? await Order.find({ 'farmer.shopId': shopId })
-            : await Order.find()
+            ? await Order.find({ 'farmer.shopId': shopId }).sort({ _id: 1 })
+            : await Order.find().sort({ _id: 1 })
 
         res.status(200).json(orders)
     } catch (error) {
diff --git a/backend/models/OrderModel.js b/backend/models/OrderModel.js
index 00e5ada7..2cb7aec9 100644
--- a/backend/models/OrderModel.js
+++ b/backend/models/OrderModel.js
@@ -1,4 +1,5 @@
 import mongoose from 'mongoose'
+import { type } from 'os'
 
 const orderSchema = new mongoose.Schema({
     farmer: {
@@ -39,6 +40,18 @@ const orderSchema = new mongoose.Schema({
     deliveryDate: {
         type: Date,
     },
+    deliveredAt: {
+        type: Date,
+        default: null,
+    },
+    deliverId: {
+        type: String,
+        default: null,
+    },
+    deliverName: {
+        type: String,
+        default: null,
+    },
 })
 
 const Order = mongoose.model('Order', orderSchema)
diff --git a/backend/routes/couponRouter.js b/backend/routes/couponRouter.js
index 2a37865e..d88c941c 100644
--- a/backend/routes/couponRouter.js
+++ b/backend/routes/couponRouter.js
@@ -1,8 +1,9 @@
 import express from 'express'
-import { validCoupon } from '../controllers/couponController.js'
+import { createCoupon, validCoupon } from '../controllers/couponController.js'
 
 const couponRouter = express.Router()
 
 couponRouter.post('/valid-coupon', validCoupon)
+couponRouter.post('/create', createCoupon)
 
 export default couponRouter
diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
index be76e0c1..489c80ce 100644
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -106,8 +106,6 @@ const router = createBrowserRouter(
             <Route path="/cart" element={<Cart />} />
             <Route path="/checkOut" element={<CheckOut />} />
             <Route path="*" element={<NotFound />} />
-
-            <Route path="/shop/:id/product/:productId" element={<ShopList />} />
         </Route>
     )
 )
diff --git a/frontend/src/Pages/Customer/UserAllOrders.jsx b/frontend/src/Pages/Customer/UserAllOrders.jsx
index 96a9c991..eda0d05d 100644
--- a/frontend/src/Pages/Customer/UserAllOrders.jsx
+++ b/frontend/src/Pages/Customer/UserAllOrders.jsx
@@ -1,6 +1,14 @@
 import React, { useEffect, useMemo, useState } from 'react'
 import OrderTable from '../../Components/OrderTable'
-import { Pagination, Table, TableBody, TableCell, TableColumn, TableHeader, TableRow } from '@nextui-org/react'
+import {
+    Pagination,
+    Table,
+    TableBody,
+    TableCell,
+    TableColumn,
+    TableHeader,
+    TableRow,
+} from '@nextui-org/react'
 
 function UserAllOrders() {
     const [page, setPage] = useState(1)
@@ -132,14 +140,26 @@ function UserAllOrders() {
                                         <span
                                             className={
                                                 item.orderStatus === 'Pending'
-                                                    ? 'text-yellow-500 p-1 rounded-md font-bold ring-0'
+                                                    ? 'bg-yellow-500 p-1 rounded-md text-white ring-0'
                                                     : item.orderStatus ===
                                                         'Delivered'
-                                                      ? 'text-green-500 p-1 rounded-md font-bold ring-0'
+                                                      ? 'bg-green-500 p-1 rounded-md text-white ring-0'
                                                       : item.orderStatus ===
                                                           'Accept'
-                                                        ? 'text-blue-500 p-1 rounded-md font-bold ring-0'
-                                                        : 'text-red-500 p-1 rounded-md font-bold ring-0'
+                                                        ? 'bg-blue-500 p-1 rounded-md text-white ring-0'
+                                                        : item.orderStatus ===
+                                                            'Ready'
+                                                          ? 'bg-purple-500 p-1 rounded-md text-white ring-0'
+                                                          : item.orderStatus ===
+                                                              'Pickup'
+                                                            ? 'bg-orange-500 p-1 rounded-md text-white ring-0'
+                                                            : item.orderStatus ===
+                                                                'OnTheWay'
+                                                              ? 'bg-indigo-500 p-1 rounded-md text-white ring-0'
+                                                              : item.orderStatus ===
+                                                                  'Rejected'
+                                                                ? 'bg-red-500 p-1 rounded-md text-white ring-0'
+                                                                : 'bg-gray-500 p-1 rounded-md text-white ring-0'
                                             }
                                         >
                                             {item.orderStatus}
diff --git a/frontend/src/Pages/Shop/ShopList.jsx b/frontend/src/Pages/Shop/ShopList.jsx
index 0624a4d0..5a4ba453 100644
--- a/frontend/src/Pages/Shop/ShopList.jsx
+++ b/frontend/src/Pages/Shop/ShopList.jsx
@@ -32,7 +32,6 @@ const ShopList = () => {
     fetchShops();
   }, []);
 
-  // Fetch bug fix
   // Filtering and Sorting Logic
   const filteredShops = shops
     .filter((shop) =>
@@ -107,7 +106,6 @@ const ShopList = () => {
           <h2 className="text-xl font-bold">Special Promotion: 20% off on all products!</h2>
         </div> */}
 
-
         {/* Search Bar */}
         <input
           type="text"
@@ -117,8 +115,6 @@ const ShopList = () => {
           className="border p-2 rounded w-full mb-4 focus:outline-none focus:ring-2 focus:ring-blue-500"
         />
 
-       
-
 {/* Loading Message */}
           {loading ? (
             <Loading />
@@ -155,9 +151,6 @@ const ShopList = () => {
       </div>
     </div>
   );
-
-
-
 };
 
 export default ShopList;
diff --git a/frontend/src/Pages/Shop/ShopPage.jsx b/frontend/src/Pages/Shop/ShopPage.jsx
index b76995b5..3fcf434c 100644
--- a/frontend/src/Pages/Shop/ShopPage.jsx
+++ b/frontend/src/Pages/Shop/ShopPage.jsx
@@ -26,10 +26,10 @@ const ShopPage = () => {
     setSearchTerm(e.target.value);
   };
 
-   //Filter products based on search term
+  // Filter products based on search term
   const filteredProducts = shop.products?.filter(product =>
     product.name.toLowerCase().includes(searchTerm.toLowerCase())
-  );  
+  );
 
   return (
     
diff --git a/frontend/src/Pages/farmer/FarmerDashboard.jsx b/frontend/src/Pages/farmer/FarmerDashboard.jsx
index cbb9fb84..3942f11a 100644
--- a/frontend/src/Pages/farmer/FarmerDashboard.jsx
+++ b/frontend/src/Pages/farmer/FarmerDashboard.jsx
@@ -373,7 +373,19 @@ const Dashboard = () => {
                                                           : item.orderStatus ===
                                                               'Accept'
                                                             ? 'bg-blue-500 p-1 rounded-md text-white ring-0'
-                                                            : 'bg-red-500 p-1 rounded-md text-white ring-0'
+                                                            : item.orderStatus ===
+                                                                'Ready'
+                                                              ? 'bg-purple-500 p-1 rounded-md text-white ring-0'
+                                                              : item.orderStatus ===
+                                                                  'Pickup'
+                                                                ? 'bg-orange-500 p-1 rounded-md text-white ring-0'
+                                                                : item.orderStatus ===
+                                                                    'OnTheWay'
+                                                                  ? 'bg-indigo-500 p-1 rounded-md text-white ring-0'
+                                                                  : item.orderStatus ===
+                                                                      'Rejected'
+                                                                    ? 'bg-red-500 p-1 rounded-md text-white ring-0'
+                                                                    : 'bg-gray-500 p-1 rounded-md text-white ring-0'
                                                 }
                                                 value={item.orderStatus}
                                                 onChange={(e) =>
@@ -386,6 +398,15 @@ const Dashboard = () => {
                                                 <option value="Accept">
                                                     Accept
                                                 </option>
+                                                <option value="Ready">
+                                                    Ready
+                                                </option>
+                                                <option value="Pickup">
+                                                    Pickup
+                                                </option>
+                                                <option value="OnTheWay">
+                                                    On the way
+                                                </option>
                                                 <option value="Delivered">
                                                     Delivered
                                                 </option>
diff --git a/frontend/src/Pages/order/Cart.jsx b/frontend/src/Pages/order/Cart.jsx
index 06559ef6..d2d309a9 100644
--- a/frontend/src/Pages/order/Cart.jsx
+++ b/frontend/src/Pages/order/Cart.jsx
@@ -2,7 +2,6 @@ import { useDisclosure } from '@nextui-org/react'
 import { useEffect, useState } from 'react'
 import { Link } from 'react-router-dom'
 // import CheckOutModal from './CheckOutModal'
-// test
 // import { useGlobalRefetch } from '../Context/GlobalRefetch'
 import axios from 'axios'
 import toast from 'react-hot-toast'
@@ -14,6 +13,7 @@ const Cart = () => {
     const [originalPrice, setOriginalPrice] = useState(0)
     // const { globalRefetch, setGlobalRefetch } = useGlobalReefetch()
     const [couponDiscount, setCouponDiscount] = useState(0)
+    const [disabledCouponButton, setDisabledCouponButton] = useState(false)
 
     useEffect(() => {
         const getCart = async () => {
@@ -34,8 +34,6 @@ const Cart = () => {
     }
     // console.log('cart', cart)
 
-    //special handling for kg test
-
     useEffect(() => {
         const calculateOriginalPrice = () => {
             const originalPrice = cart.reduce((acc, item) => {
@@ -79,6 +77,7 @@ const Cart = () => {
                         JSON.stringify((total * couponDiscount) / 100)
                     )
                     toast.success('Coupon Applied Successfully')
+                    setDisabledCouponButton(true)
                 }
             }
         } catch (error) {
@@ -313,9 +312,13 @@ const Cart = () => {
                                     </div>
                                     <button
                                         type="submit"
-                                        disabled={cart.length === 0}
+                                        disabled={
+                                            cart.length === 0 ||
+                                            disabledCouponButton
+                                        }
                                         className={`flex w-full items-center justify-center rounded-lg px-5 py-2.5 text-sm font-medium ${
-                                            cart.length === 0
+                                            cart.length === 0 ||
+                                            disabledCouponButton
                                                 ? 'bg-gray-400 text-gray-700 cursor-not-allowed'
                                                 : 'bg-primary-700 text-white hover:bg-primary-800 focus:outline-none focus:ring-4 focus:ring-primary-300 dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800'
                                         }`}
diff --git a/frontend/src/Pages/order/Ordermanager.jsx b/frontend/src/Pages/order/Ordermanager.jsx
deleted file mode 100644
index f27abb96..00000000
--- a/frontend/src/Pages/order/Ordermanager.jsx
+++ /dev/null
@@ -1,175 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import axios from 'axios';
-import { Link } from 'react-router-dom';
-import Loading from '../../Components/Loading';
-
-const ShopList = () => {
-  const [shops, setShops] = useState([]);
-  const [searchTerm, setSearchTerm] = useState('');
-  const [sortOrder, setSortOrder] = useState('asc');
-  const [filterCategory, setFilterCategory] = useState('');
-  const [filterDistrict, setFilterDistrict] = useState('');
-  const [loading, setLoading] = useState(true); // Loading state
-
-  // Fetch shops on component mount
-  useEffect(() => {
-    const fetchShops = async () => {
-      try {
-        const config = {
-          headers: {
-            Authorization: `Bearer ${localStorage.getItem('token')}`,
-          },
-        };
-        const { data } = await axios.get('/api/userShops', config);
-        setShops(data);
-      } catch (error) {
-        console.error('Error fetching shops:', error);
-      } finally {
-        setLoading(false); // Set loading to false after fetch
-      }
-    };
-
-    fetchShops();
-  }, []);
-
-  // Fetch bug fix
-  // Filtering and Sorting Logic
-  const filteredShops = shops
-    .filter((shop) =>
-      shop.name.toLowerCase().includes(searchTerm.toLowerCase())
-    )
-    .filter((shop) =>
-      filterCategory ? shop.category === filterCategory : true
-    )
-    .filter((shop) =>
-      filterDistrict ? shop.district === filterDistrict : true
-    )
-    .sort((a, b) => {
-      if (sortOrder === 'asc') {
-        return a.name.localeCompare(b.name);
-      } else {
-        return b.name.localeCompare(a.name);
-      }
-    });
-
-  return (
-
-        <div className="relative min-h-screen bg-gray-50 grid grid-cols-1 justify-center">
-    <div className="flex flex-col lg:flex-row">
-      {/* Sidebar */}
-      <div className="w-full lg:w-1/6 p-4 bg-white shadow-md rounded mb-4 lg:mb-0">
-        <h2 className="text-xl font-bold mb-4">Filters</h2>
-        <div className="mb-4">
-          <label className="block mb-2">Sort by:</label>
-          <select
-            value={sortOrder}
-            onChange={(e) => setSortOrder(e.target.value)}
-            className="border p-2 rounded w-full focus:outline-none focus:ring-2 focus:ring-blue-500"
-          >
-            <option value="asc">Name (A-Z)</option>
-            <option value="desc">Name (Z-A)</option>
-          </select>
-        </div>
-        
-        <div className="mb-4">
-          <label className="block mb-2">Categorys:</label>
-          <select
-            value={filterCategory}
-            onChange={(e) => setFilterCategory(e.target.value)}
-            className="border p-2 rounded w-full focus:outline-none focus:ring-2 focus:ring-blue-500"
-          >
-            <option value="">All Categories</option>
-            <option value="Vegetables">Vegetables</option>
-            <option value="fruits">Fruits</option>
-            <option value="Spices">Spices</option>
-            <option value="Spices">Meat</option>
-            <option value="Spices">Fish</option>
-          </select>
-        </div>
-
-        <div className="mb-4">
-          <label className="block mb-2">District:</label>
-          <select
-            value={filterDistrict}
-            onChange={(e) => setFilterDistrict(e.target.value)}
-            className="border p-2 rounded w-full focus:outline-none focus:ring-2 focus:ring-blue-500"
-          >
-            <option value="">All Districts</option>
-            <option value="Gampaha">Gampaha</option>
-            <option value="Badulla">Badulla</option>
-            {/* Add more district options as needed */}
-          </select>
-        </div>
-      </div>
-
-      {/* Main Content */}
-      <div className="flex-1 p-6">
-        {/* Promotional Banner */}
-        {/* <div className="bg-blue-500 text-white text-center p-4 mb-6 rounded">
-          <h2 className="text-xl font-bold">Special Promotion: 20% off on all products!</h2>
-        </div> */}
-
-
-        {/* Test Button */}
-        <div className="mb-4">
-            <Link
-              to="/" // Adjust the route to where you want this button to navigate
-              className="bg-green-500 text-white py-2 px-4 rounded hover:bg-green-600 transition-colors duration-200"
-            >
-              Contact Shop Manager
-            </Link>
-          </div>
-
-        {/* Search Bar */}
-        <input
-          type="text"
-          placeholder="Search shops..."
-          value={searchTerm}
-          onChange={(e) => setSearchTerm(e.target.value)}
-          className="border p-2 rounded w-full mb-4 focus:outline-none focus:ring-2 focus:ring-blue-500"
-        />
-
-       
-
-{/* Loading Message */}
-          {loading ? (
-            <Loading />
-          ) : (
-            <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6">
-              {filteredShops.length > 0 ? (
-                filteredShops.map((shop) => (
-                  <div key={shop._id} className="bg-white p-4 rounded-lg shadow hover:shadow-lg transition-shadow duration-200">
-                    {shop.image && (
-                      <img 
-                        src={shop.image} 
-                        alt={`${shop.name} image`} 
-                        className="w-full h-32 object-cover rounded-t-lg mb-4"
-                      />
-                    )}
-                    <h3 className="text-lg font-semibold">{shop.name}</h3>
-                    <p className="text-gray-600">{shop.address.streetName}, {shop.address.city}, {shop.district}</p>
-                    <p className="text-gray-500">{shop.email}</p>
-                    
-                    <Link
-                      to={`/shop/${shop._id}`}
-                      className="mt-4 inline-block bg-blue-500 text-white py-2 px-4 rounded hover:bg-blue-600 transition-colors duration-200"
-                    >
-                      Visit Shop
-                    </Link>
-                  </div>
-                ))
-              ) : (
-                <p>No shops found</p>
-              )}
-            </div>
-          )}
-        </div>
-      </div>
-    </div>
-  );
-
-
-
-};
-
-export default ShopList;
diff --git a/frontend/src/Pages/order/checkOut.jsx b/frontend/src/Pages/order/checkOut.jsx
index 007f341b..4cf4cc53 100644
--- a/frontend/src/Pages/order/checkOut.jsx
+++ b/frontend/src/Pages/order/checkOut.jsx
@@ -57,96 +57,103 @@ const CheckOut = () => {
         setTotal(originalPrice - couponDiscount)
     }, [originalPrice, couponDiscount])
 
-    const onSubmit = async () => {
-        const nameError = validateName(name)
-        const emailError = validateEmail(email)
-        const cityError = validateCity(city)
-        const phoneError = validatePhone(phone)
-        const addressError = validateAddress(address)
-
-        setErrors({
-            name: nameError,
-            email: emailError,
-            city: cityError,
-            phone: phoneError,
-            address: addressError,
-        })
-
-        if (
-            nameError ||
-            emailError ||
-            cityError ||
-            phoneError ||
-            addressError
-        ) {
-            toast.error('Please correct the errors before proceeding.')
-            return
-        }
-
-        if (!stripe || !elements) {
-            toast.error('Stripe.js has not loaded yet.')
-            return
-        }
-
-        const data = {
-            farmer: {
-                shopId: cart[0].shopId,
-            },
-            user: user,
-            orderItems: cart,
-            shippingAddress: {
-                name,
-                email,
-                city,
-                phone,
-                address,
-            },
-            totalPrice: total,
-            deliveryDateObj: date,
-        }
-
-        console.log(data)
-
-        try {
-            const response = await axios.post(
-                'http://localhost:5000/api/orders/create-payment-intent',
-                {
-                    totalPrice: (data.totalPrice / 300).toFixed(2),
-                    user: data.user,
-                }
-            )
-
-            const clientSecret = response.data.clientSecret
-
-            const paymentResult = await stripe.confirmCardPayment(
-                clientSecret,
-                {
-                    payment_method: {
-                        type: 'card',
-                        card: elements.getElement(CardNumberElement),
-                        billing_details: {
-                            name: data.shippingAddress.name,
-                            email: data.shippingAddress.email,
-                        },
-                    },
-                }
-            )
-            console.log(paymentResult)
-            if (paymentResult.error) {
-                toast.error(paymentResult.error.message)
-            } else if (paymentResult.paymentIntent.status === 'succeeded') {
-                await axios.post('http://localhost:5000/api/orders', data)
-                toast.success('Payment successful, order placed!')
-                localStorage.removeItem('cart')
-                localStorage.removeItem('coupon')
-                navigate('/orderhistory')
-            }
-        } catch (error) {
-            toast.error('Failed to place order')
-            console.error(error)
-        }
-    }
-
+ const onSubmit = async () => {
+     const nameError = validateName(name)
+     const emailError = validateEmail(email)
+     const cityError = validateCity(city)
+     const phoneError = validatePhone(phone)
+     const addressError = validateAddress(address)
+
+     setErrors({
+         name: nameError,
+         email: emailError,
+         city: cityError,
+         phone: phoneError,
+         address: addressError,
+     })
+
+     if (nameError || emailError || cityError || phoneError || addressError) {
+         toast.error('Please correct the errors before proceeding.')
+         return
+     }
+
+     if (!stripe || !elements) {
+         toast.error('Stripe.js has not loaded yet.')
+         return
+     }
+
+     const groupedOrders = cart.reduce((acc, item) => {
+         if (!acc[item.shopId]) {
+             acc[item.shopId] = []
+         }
+         acc[item.shopId].push(item)
+         return acc
+     }, {})
+
+     try {
+         for (const [shopId, orderItems] of Object.entries(groupedOrders)) {
+             const data = {
+                 farmer: { shopId },
+                 user: user,
+                 orderItems: orderItems,
+                 shippingAddress: {
+                     name,
+                     email,
+                     city,
+                     phone,
+                     address,
+                 },
+                 totalPrice: orderItems.reduce(
+                     (acc, item) => acc + item.price * item.quantity,
+                     0
+                 ),
+                 deliveryDateObj: date,
+             }
+
+             const response = await axios.post(
+                 'http://localhost:5000/api/orders/create-payment-intent',
+                 {
+                     totalPrice: (data.totalPrice / 300).toFixed(2),
+                     user: data.user,
+                 }
+             )
+
+             const clientSecret = response.data.clientSecret
+
+             const paymentResult = await stripe.confirmCardPayment(
+                 clientSecret,
+                 {
+                     payment_method: {
+                         type: 'card',
+                         card: elements.getElement(CardNumberElement),
+                         billing_details: {
+                             name: data.shippingAddress.name,
+                             email: data.shippingAddress.email,
+                         },
+                     },
+                 }
+             )
+
+             if (paymentResult.error) {
+                 toast.error(paymentResult.error.message)
+                 return
+             } else if (paymentResult.paymentIntent.status === 'succeeded') {
+                 await axios.post('http://localhost:5000/api/orders', data)
+                 toast.success(
+                     `Payment successful for farmer ${shopId}, order placed!`
+                 )
+             }
+         }
+
+         localStorage.removeItem('cart')
+         localStorage.removeItem('coupon')
+         navigate('/orderhistory')
+     } catch (error) {
+         toast.error('Failed to place order')
+         console.error(error)
+     }
+ }
+   
     useEffect(() => {
         const getCart = async () => {
             const cart = JSON.parse(localStorage.getItem('cart')) || []