diff --git a/src/features/cashier-dashboard/components/cashier_dashboard_payment_confirm_popup/ConfirmPaymentPopUp.tsx b/src/features/cashier-dashboard/components/cashier_dashboard_payment_confirm_popup/ConfirmPaymentPopUp.tsx
index 07f792b..7ac61c9 100644
--- a/src/features/cashier-dashboard/components/cashier_dashboard_payment_confirm_popup/ConfirmPaymentPopUp.tsx
+++ b/src/features/cashier-dashboard/components/cashier_dashboard_payment_confirm_popup/ConfirmPaymentPopUp.tsx
@@ -131,7 +131,7 @@ const ConfirmPaymentPopUp = () => {
                     className='signup_button w-28 rounded-full'
                     onClick={confirmClick}
                   >
-                    Pay
+                    {loading ? 'Wait...' : 'Pay'}
                   </button>
                 )
               }
diff --git a/src/features/cashier-dashboard/components/medicine-table/Medicine.tsx b/src/features/cashier-dashboard/components/medicine-table/Medicine.tsx
index 223ed75..6e1611c 100644
--- a/src/features/cashier-dashboard/components/medicine-table/Medicine.tsx
+++ b/src/features/cashier-dashboard/components/medicine-table/Medicine.tsx
@@ -83,10 +83,12 @@ const Medicine = () => {
                 </td>
                 <td className='px-6 py-4'>{cashier.status}</td>
                 <td className='px-6 py-4'>
-                  <CountRoundButton
-                    onClick={() => handleAddClick(cashier)}
-                    icon={<IoIosAdd />}
-                  />
+                  {cashier.quantity > 0 && (
+                    <CountRoundButton
+                      onClick={() => handleAddClick(cashier)}
+                      icon={<IoIosAdd />}
+                    />
+                  )}
                 </td>
               </tr>
             ))}
diff --git a/src/features/cashier-dashboard/components/order-details/MedicineGrid.tsx b/src/features/cashier-dashboard/components/order-details/MedicineGrid.tsx
index 41c08d8..bd3b67b 100644
--- a/src/features/cashier-dashboard/components/order-details/MedicineGrid.tsx
+++ b/src/features/cashier-dashboard/components/order-details/MedicineGrid.tsx
@@ -20,6 +20,8 @@ const MedicineGrid = () => {
 
   const handleAddAmount = (index: number) => {
     const updatedMedicines = [...orderedMedicine];
+    console.log(updatedMedicines);
+    console.log(filteredMedicine);
 
     if (updatedMedicines[index].availableQuantity > 0) {
       updatedMedicines[index].amount += 1;
diff --git a/src/features/cashier-dashboard/services/ItemService.ts b/src/features/cashier-dashboard/services/ItemService.ts
index 0fb34aa..04ff4da 100644
--- a/src/features/cashier-dashboard/services/ItemService.ts
+++ b/src/features/cashier-dashboard/services/ItemService.ts
@@ -4,6 +4,7 @@ import { mapIItemsToIMedicine } from '../utils/mapIItemsToIMedicine';
 import { useUserContext } from '../../../context/UserContext';
 import { toast } from 'react-toastify';
 import { IMedicine } from '../../../interfaces/IMedicine';
+import { usePaymentContext } from '../layout/MainCashierDashboard';
 
 const useItemService = () => {
   const http = useAxiosInstance();
@@ -24,10 +25,13 @@ const useItemService = () => {
   //   }
   // };
   const user = useUserContext();
-  const [medicine, setMedicine] = useState<IMedicine[]>([]);
-  const [filteredMedicine, setFilteredMedicine] = useState<IMedicine[]>([]);
+  // const [medicine, setMedicine] = useState<IMedicine[]>([]);
+  // const [filteredMedicine, setFilteredMedicine] = useState<IMedicine[]>([]);
   const [loading, setLoading] = useState<boolean>(false);
 
+  const { setMedicine, medicine, setFilteredMedicine, filteredMedicine } =
+    usePaymentContext();
+
   const getAllItems = async () => {
     try {
       if (!user) {
diff --git a/src/features/cashier-dashboard/services/OrderService.ts b/src/features/cashier-dashboard/services/OrderService.ts
index c3c76dd..27dfe52 100644
--- a/src/features/cashier-dashboard/services/OrderService.ts
+++ b/src/features/cashier-dashboard/services/OrderService.ts
@@ -34,7 +34,6 @@ const useOrderService = () => {
         paymentDetails: paymentDetails,
       });
       console.log(res);
-      setLoading(false);
       // Display success toast
       toast.success('Order placed successfully!');
 
@@ -43,10 +42,11 @@ const useOrderService = () => {
       return res.data;
     } catch (error) {
       console.log(error);
-      setLoading(false);
       toast.error('Error with the server: ' + (error as Error).message);
 
       return error;
+    } finally {
+      setLoading(false);
     }
   };