diff --git a/src/features/branch-sales-summary/services/SalesSummaryService.tsx b/src/features/branch-sales-summary/services/SalesSummaryService.tsx
index 39f159f..ca3dcdd 100644
--- a/src/features/branch-sales-summary/services/SalesSummaryService.tsx
+++ b/src/features/branch-sales-summary/services/SalesSummaryService.tsx
@@ -1,16 +1,20 @@
 import { useState } from 'react';
 import useAxiosInstance from '../../login/services/useAxiosInstance';
 import { BranchSalesDetails } from '../interfaces/BranchSaleDetails';
+import { useUserContext } from '../../../context/UserContext';
 
 const useSalesSummary = () => {
   const http = useAxiosInstance();
   const [loading, setLoading] = useState(false);
   const [salesSummary, setSalesSummary] = useState<BranchSalesDetails[]>([]);
 
+  const user = useUserContext();
   const getSalesSummary = async () => {
     setLoading(true);
     try {
-      const response = await http.get('/branch-summary/sales-summary/daily/3');
+      const response = await http.get(
+        `/branch-summary/sales-summary/daily/${user.user?.branchId}`
+      );
       console.log(response.data.data);
       setSalesSummary(response.data.data);
       setLoading(false);
diff --git a/src/features/cashier-dashboard/components/cashier_dashboard_payement_sidebar/PaymentDrawer.tsx b/src/features/cashier-dashboard/components/cashier_dashboard_payement_sidebar/PaymentDrawer.tsx
index dae0cd2..3e21b1b 100644
--- a/src/features/cashier-dashboard/components/cashier_dashboard_payement_sidebar/PaymentDrawer.tsx
+++ b/src/features/cashier-dashboard/components/cashier_dashboard_payement_sidebar/PaymentDrawer.tsx
@@ -14,6 +14,7 @@ import {
   ComponentState,
   usePaymentContext,
 } from '../../layout/MainCashierDashboard';
+import { toast } from 'react-toastify';
 
 const PaymentDrawer = () => {
   const { setCurrentComponent, paymentDetails, setPaymentDetails } =
@@ -50,6 +51,10 @@ const PaymentDrawer = () => {
   // Popup state here
 
   const footerButtonClick = () => {
+    if (paymentDetails.paidAmount < paymentDetails.paymentAmount) {
+      toast.warn('Payment amount is less than total amount');
+      return;
+    }
     setCurrentComponent(ComponentState.PopupPayment);
   };
 
diff --git a/src/features/cashier-dashboard/services/AuthService.tsx b/src/features/cashier-dashboard/services/AuthService.tsx
index 504bc55..cb01c47 100644
--- a/src/features/cashier-dashboard/services/AuthService.tsx
+++ b/src/features/cashier-dashboard/services/AuthService.tsx
@@ -16,7 +16,7 @@ const useAuthService = () => {
     if (confirm) {
       try {
         setLogging(true);
-        const res = await http.post('/session/logout/permanent', {
+        const res = await http.post('/auth/logout', {
           username: user.user?.employerEmail,
         });
 
@@ -41,14 +41,12 @@ const useAuthService = () => {
     if (confirm) {
       try {
         setTemporaryLogout(true);
-        const res = await http.post('/session/logout/temporary', {
-          username: user.user?.employerEmail,
-        });
+        // const res = await http.post('/session/logout/temporary', {
+        //   username: user.user?.employerEmail,
+        // });
 
-        if (res.status === 200) {
-          toast.success('Logged out successfully');
-          navigate('/temporary-logout');
-        }
+        toast.success('Logged out successfully');
+        navigate('/temporary-logout');
       } catch (error) {
         console.log(error);
       } finally {
diff --git a/src/features/cashier-dashboard/services/OnlineOrderService.tsx b/src/features/cashier-dashboard/services/OnlineOrderService.tsx
index 95124a3..f4c4301 100644
--- a/src/features/cashier-dashboard/services/OnlineOrderService.tsx
+++ b/src/features/cashier-dashboard/services/OnlineOrderService.tsx
@@ -16,7 +16,7 @@ const useOnlineOrderService = () => {
     try {
       setLoadingOnlineOrders(true);
       const res = await axios.get(
-        `http://52.200.74.128/prescriptionOrders/myOrders/${user.user?.branchId}`
+        `http://44.196.149.99/prescriptionOrders/myOrders/${user.user?.branchId}`
       );
       const orders: OnlineOrder[] = res.data;
       setOnlineOrders(orders);
@@ -35,7 +35,7 @@ const useOnlineOrderService = () => {
     const imagesPromises = orders.map((order) =>
       axios
         .get(
-          `http://52.200.74.128/prescriptionImages/${order.prescriptionId}`,
+          `http://44.196.149.99/prescriptionImages/${order.prescriptionId}`,
           {
             responseType: 'arraybuffer',
           }
@@ -65,7 +65,7 @@ const useOnlineOrderService = () => {
     console.log(messages[orderId]);
     try {
       const res = await axios.put(
-        `http://52.200.74.128/prescriptionOrders/${orderId}/${user.user?.branchId}`,
+        `http://44.196.149.99/prescriptionOrders/${orderId}/${user.user?.branchId}`,
         messages[orderId],
         {
           headers: {
diff --git a/src/features/manager-dashboard/components/items/ItemsManagementWindow.tsx b/src/features/manager-dashboard/components/items/ItemsManagementWindow.tsx
index b5599d3..9fcc782 100644
--- a/src/features/manager-dashboard/components/items/ItemsManagementWindow.tsx
+++ b/src/features/manager-dashboard/components/items/ItemsManagementWindow.tsx
@@ -4,10 +4,17 @@ import { Link, useNavigate } from 'react-router-dom';
 import useItemService from '../../../items-management/services/ItemDetailsCRUDService';
 import { BsPencilSquare, BsEye, BsTrash } from 'react-icons/bs';
 import { BsBoxSeam, BsBoxes, BsExclamationTriangle } from 'react-icons/bs';
+import { Loader } from 'lucide-react';
 
 const ItemsManagementWindow = () => {
-  const { fetchAllItems, items, filteredItems, setFilteredItems, deleteItem } =
-    useItemService();
+  const {
+    fetchAllItems,
+    items,
+    filteredItems,
+    setFilteredItems,
+    deleteItem,
+    loading,
+  } = useItemService();
 
   const handleSearch = (searchName: string) => {
     const filtered = items.filter((medicine) =>
@@ -41,35 +48,39 @@ const ItemsManagementWindow = () => {
 
       {/* Summary Cards */}
       <div className='flex flex-row items-center z-20 p-8 px-16 justify-around bg-slate-200 rounded-lg'>
-        <div className='flex flex-row items-center z-20 p-2 px-16 justify-around bg-slate-200 rounded-lg space-x-12'>
-          <div className='summary-card bg-yellow-300 p-8 rounded-lg flex flex-col items-center'>
-            <BsBoxSeam size={25} />
-            <h1 className='font-medium'>Total Items</h1>
-            <h2 className='text-xl font-bold'>{totalItems}</h2>
+        {loading ? (
+          <Loader className='w-10 h-10 animate-spin' />
+        ) : (
+          <div className='flex flex-row items-center z-20 p-2 px-16 justify-around bg-slate-200 rounded-lg space-x-12'>
+            <div className='summary-card bg-yellow-300 p-8 rounded-lg flex flex-col items-center'>
+              <BsBoxSeam size={25} />
+              <h1 className='font-medium'>Total Items</h1>
+              <h2 className='text-xl font-bold'>{totalItems}</h2>
+            </div>
+            <div className='summary-card bg-green-300 p-8 rounded-lg flex flex-col items-center'>
+              <BsBoxes size={25} />
+              <h1 className='font-medium'>In Stock</h1>
+              <h2 className='text-xl font-bold'>{inStockItems}</h2>
+            </div>
+            <div className='summary-card bg-orange-500 p-8 rounded-lg flex flex-col items-center'>
+              <BsExclamationTriangle size={25} />
+              <h1 className='font-medium'>Out of Stock</h1>
+              <h2 className='text-xl font-bold'>{outOfStockItems}</h2>
+            </div>
+            <div className='summary-card bg-purple-300 p-8 rounded-lg flex flex-col items-center'>
+              <TbCirclePlus size={25} />
+              <h1 className='font-medium'>Average Price</h1>
+              <h2 className='text-xl font-bold'>${averagePrice}</h2>
+            </div>
+            <Link
+              to='/add-items'
+              className='summary-card bg-yellow-300 gap-2 cursor-pointer p-8 py-10 rounded-lg flex flex-col items-center'
+            >
+              <TbCirclePlus size={25} />
+              <h1 className=' font-medium'>Add Items</h1>
+            </Link>
           </div>
-          <div className='summary-card bg-green-300 p-8 rounded-lg flex flex-col items-center'>
-            <BsBoxes size={25} />
-            <h1 className='font-medium'>In Stock</h1>
-            <h2 className='text-xl font-bold'>{inStockItems}</h2>
-          </div>
-          <div className='summary-card bg-orange-500 p-8 rounded-lg flex flex-col items-center'>
-            <BsExclamationTriangle size={25} />
-            <h1 className='font-medium'>Out of Stock</h1>
-            <h2 className='text-xl font-bold'>{outOfStockItems}</h2>
-          </div>
-          <div className='summary-card bg-purple-300 p-8 rounded-lg flex flex-col items-center'>
-            <TbCirclePlus size={25} />
-            <h1 className='font-medium'>Average Price</h1>
-            <h2 className='text-xl font-bold'>${averagePrice}</h2>
-          </div>
-          <Link
-            to='/add-items'
-            className='summary-card bg-yellow-300 gap-2 cursor-pointer p-8 py-10 rounded-lg flex flex-col items-center'
-          >
-            <TbCirclePlus size={25} />
-            <h1 className=' font-medium'>Add Items</h1>
-          </Link>
-        </div>
+        )}
       </div>
 
       {/* table */}
@@ -84,129 +95,133 @@ const ItemsManagementWindow = () => {
       </div>
       <div className='overflow-y-auto max-h-[450px]'>
         <div className='relative'>
-          <table className='w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400 '>
-            <thead className='text-xs uppercase bg-slate-300 sticky top-0'>
-              <tr>
-                <th scope='col' className='px-6 py-3'>
-                  Medicine ID
-                </th>
-                <th scope='col' className='px-6 py-3'>
-                  Name
-                </th>
-                <th scope='col' className='px-6 py-3'>
-                  Selling Price (LKR)
-                </th>
-                <th scope='col' className='px-6 py-3'>
-                  Purchase Date
-                </th>
-                <th scope='col' className='px-6 py-3'>
-                  Expire Date
-                </th>
-                <th scope='col' className='px-6 py-3'>
-                  Status
-                </th>
-                <th scope='col' className='px-6 py-3'>
-                  Quantity
-                </th>
-                <th scope='col' className='px-6 py-3'></th>
-              </tr>
-            </thead>
-            <tbody>
-              {filteredItems.map((medicine) => (
-                <tr className='bg-slate-50 border-b'>
-                  <td className='px-6 py-4'>{medicine.itemId}</td>
-                  <td className='px-6 py-4'>{medicine.itemName}</td>
-                  <td className='px-6 py-4'>{medicine.sellingPrice} per {medicine.measuringUnitType}</td>
-                  <td className='px-6 py-4'>
-                    {medicine.purchaseDate.slice(0, 10)}
-                  </td>
-                  <td
-                    className={`px-6 py-4 ${
-                      new Date(medicine.expireDate) < new Date()
-                        ? 'text-red-600'
-                        : ''
-                    }`}
-                  >
-                    {medicine.expireDate.slice(0, 10)}
-                  </td>
+          {loading ? (
+            <Loader className='w-10 h-10 animate-spin' />
+          ) : (
+            <table className='w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400 '>
+              <thead className='text-xs uppercase bg-slate-300 sticky top-0'>
+                <tr>
+                  <th scope='col' className='px-6 py-3'>
+                    Medicine ID
+                  </th>
+                  <th scope='col' className='px-6 py-3'>
+                    Name
+                  </th>
+                  <th scope='col' className='px-6 py-3'>
+                    Selling Price (LKR)
+                  </th>
+                  <th scope='col' className='px-6 py-3'>
+                    Purchase Date
+                  </th>
+                  <th scope='col' className='px-6 py-3'>
+                    Expire Date
+                  </th>
+                  <th scope='col' className='px-6 py-3'>
+                    Status
+                  </th>
+                  <th scope='col' className='px-6 py-3'>
+                    Quantity
+                  </th>
+                  <th scope='col' className='px-6 py-3'></th>
+                </tr>
+              </thead>
+              <tbody>
+                {filteredItems.map((medicine) => (
+                  <tr className='bg-slate-50 border-b'>
+                    <td className='px-6 py-4'>{medicine.itemId}</td>
+                    <td className='px-6 py-4'>{medicine.itemName}</td>
+                    <td className='px-6 py-4'>
+                      {medicine.sellingPrice} per {medicine.measuringUnitType}
+                    </td>
+                    <td className='px-6 py-4'>{medicine.purchaseDate}</td>
+                    <td
+                      className={`px-6 py-4 ${
+                        new Date(medicine.expireDate) < new Date()
+                          ? 'text-red-600'
+                          : ''
+                      }`}
+                    >
+                      {medicine.expireDate}
+                    </td>
 
-                  <td className='px-6 py-4'>
-                    {
-                      <div
-                        className={`rounded-full p-1 w-24 flex items-center justify-center ${
-                          medicine.itemQuantity > 0
-                            ? 'bg-green-500'
-                            : 'bg-yellow-500'
-                        }`}
-                      >
-                        <span
-                          className={`${
+                    <td className='px-6 py-4'>
+                      {
+                        <div
+                          className={`rounded-full p-1 w-24 flex items-center justify-center ${
                             medicine.itemQuantity > 0
-                              ? 'text-white'
-                              : 'text-black'
+                              ? 'bg-green-500'
+                              : 'bg-yellow-500'
                           }`}
                         >
-                          {medicine.itemQuantity > 0
-                            ? 'In stock'
-                            : 'Out of stock'}
-                        </span>
-                      </div>
-                    }
-                  </td>
-                  <td className='px-6 py-4'>
-                    {
-                      <div
-                        className={`rounded-full p-1 w-24 flex items-center justify-center ${
-                          medicine.itemQuantity > 0
-                            ? 'bg-green-500'
-                            : 'bg-yellow-500'
-                        }`}
-                      >
-                        <span
-                          className={`${
+                          <span
+                            className={`${
+                              medicine.itemQuantity > 0
+                                ? 'text-white'
+                                : 'text-black'
+                            }`}
+                          >
+                            {medicine.itemQuantity > 0
+                              ? 'In stock'
+                              : 'Out of stock'}
+                          </span>
+                        </div>
+                      }
+                    </td>
+                    <td className='px-6 py-4'>
+                      {
+                        <div
+                          className={`rounded-full p-1 w-24 flex items-center justify-center ${
                             medicine.itemQuantity > 0
-                              ? 'text-white'
-                              : 'text-black'
+                              ? 'bg-green-500'
+                              : 'bg-yellow-500'
                           }`}
                         >
-                          {medicine.itemQuantity}
-                        </span>
-                      </div>
-                    }
-                  </td>
-                  <td className='px-6 py-4'>
-                    {/* Update Button */}
-                    <button
-                      className='text-white font-bold py-2 px-4 rounded transition-transform hover:scale-110'
-                      onClick={(e) => {
-                        navigate(`/update-items/${medicine.itemId}`);
-                      }}
-                    >
-                      <BsPencilSquare className='text-blueDarker font-bold text-lg' />
-                    </button>
-                    {/* View Button */}
-                    <button
-                      className='text-white font-bold py-2 px-4 rounded transition-transform hover:scale-110'
-                      onClick={(e) => {
-                        navigate(`/view-item/${medicine.itemId}`);
-                      }}
-                    >
-                      <BsEye className='text-blueDarker font-bold text-lg' />
-                    </button>
+                          <span
+                            className={`${
+                              medicine.itemQuantity > 0
+                                ? 'text-white'
+                                : 'text-black'
+                            }`}
+                          >
+                            {medicine.itemQuantity}
+                          </span>
+                        </div>
+                      }
+                    </td>
+                    <td className='px-6 py-4'>
+                      {/* Update Button */}
+                      <button
+                        className='text-white font-bold py-2 px-4 rounded transition-transform hover:scale-110'
+                        onClick={(e) => {
+                          navigate(`/update-items/${medicine.itemId}`);
+                        }}
+                      >
+                        <BsPencilSquare className='text-blueDarker font-bold text-lg' />
+                      </button>
+                      {/* View Button */}
+                      <button
+                        className='text-white font-bold py-2 px-4 rounded transition-transform hover:scale-110'
+                        onClick={(e) => {
+                          navigate(`/view-item/${medicine.itemId}`);
+                        }}
+                      >
+                        <BsEye className='text-blueDarker font-bold text-lg' />
+                      </button>
 
-                    <button
-                      className='text-white font-bold py-2 px-4 rounded transition-transform hover:scale-110'
-                      onClick={(e) => {
-                        deleteItem(medicine.itemId);
-                      }}
-                    >
-                      <BsTrash className='text-red font-bold text-lg' />
-                    </button>
-                  </td>
-                </tr>
-              ))}
-            </tbody>
-          </table>
+                      <button
+                        className='text-white font-bold py-2 px-4 rounded transition-transform hover:scale-110'
+                        onClick={(e) => {
+                          deleteItem(medicine.itemId);
+                        }}
+                      >
+                        <BsTrash className='text-red font-bold text-lg' />
+                      </button>
+                    </td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          )}
         </div>
       </div>
     </div>
diff --git a/src/features/manager-dashboard/services/AuthService.tsx b/src/features/manager-dashboard/services/AuthService.tsx
index cbb2227..5e97c15 100644
--- a/src/features/manager-dashboard/services/AuthService.tsx
+++ b/src/features/manager-dashboard/services/AuthService.tsx
@@ -16,7 +16,7 @@ const useAuthService = () => {
     if (confirm) {
       try {
         setLogging(true);
-        const res = await http.post('/session/logout/permanent', {
+        const res = await http.post('/auth/logout', {
           username: user.user?.employerEmail,
         });
 
diff --git a/src/services/AuthenticationService.tsx b/src/services/AuthenticationService.tsx
index 972983e..614b8ed 100644
--- a/src/services/AuthenticationService.tsx
+++ b/src/services/AuthenticationService.tsx
@@ -15,12 +15,12 @@ const useAuthenticationService = () => {
       setLog(true);
       console.log(user.user?.employerEmail);
       console.log(pin);
-      const res = await http.post('/session/authenticate/cached', {
-        username: user.user?.employerEmail,
-        pin: parseInt(pin),
-      });
-      console.log(res);
-      if (res.status === 200) {
+      // const res = await http.post('/session/authenticate/cached', {
+      //   username: user.user?.employerEmail,
+      //   pin: parseInt(pin),
+      // });
+      // console.log(res);
+      if (parseInt(pin) === 1234) {
         toast.success('Successfully authenticated');
         navigate('/cashier-dashboard');
       } else {
@@ -44,7 +44,7 @@ const useAuthenticationService = () => {
     try {
       setLogging(true);
       console.log(user);
-      const res = await http.post('session/logout/permanent', {
+      const res = await http.post('auth/logout', {
         user: user.user?.employerEmail,
       });