diff --git a/hotel_booking/admin/ajax/accomm.php b/hotel_booking/admin/ajax/accomm.php
index 50a1d7c..71eb0b6 100644
--- a/hotel_booking/admin/ajax/accomm.php
+++ b/hotel_booking/admin/ajax/accomm.php
@@ -33,9 +33,17 @@
     if(isset($_POST['remove_accomm'])){
         $frm_data = filteration($_POST);
         $values = [$frm_data['remove_accomm']];
-        $q = "DELETE FROM `accommodation` WHERE `id`=?";
-        $res = delete($q, $values, 'i');
-        echo $res;
+
+        $check_q = select('SELECT * FROM `room_accommodation` WHERE `accommodation_id`=?', [$frm_data['remove_accomm']], 'i');
+        if(mysqli_num_rows($check_q) == 0){
+            $q = "DELETE FROM `accommodation` WHERE `id`=?";
+            $res = delete($q, $values, 'i');
+            echo $res;
+        } else{
+            echo 'room_add';
+        }
+
+        
     }
 
     if(isset($_POST['add_addiAccomm'])){
@@ -67,9 +75,14 @@
     if(isset($_POST['remove_addiAccomm'])){
         $frm_data = filteration($_POST);
         $values = [$frm_data['remove_addiAccomm']];
-        $q = "DELETE FROM `additional_accomm` WHERE `id`=?";
-        $res = delete($q, $values, 'i');
-        echo $res;
+        $check_q = select('SELECT * FROM `room_additionalAccom` WHERE `additionalAccom_id`=?', [$frm_data['remove_addiAccomm']], 'i');
+        if(mysqli_num_rows($check_q) == 0){
+            $q = "DELETE FROM `additional_accomm` WHERE `id`=?";
+            $res = delete($q, $values, 'i');
+            echo $res;
+        } else{
+            echo 'room_add';
+        }
     }
 
 ?>
\ No newline at end of file
diff --git a/hotel_booking/admin/ajax/room.php b/hotel_booking/admin/ajax/room.php
index 31df4e7..f4d9c4a 100644
--- a/hotel_booking/admin/ajax/room.php
+++ b/hotel_booking/admin/ajax/room.php
@@ -116,7 +116,59 @@
     }
 
     if(isset($_POST['edit_room'])){
+        $accommodation = filteration(json_decode($_POST['accommodation']));
+        $additional_accomm = filteration(json_decode($_POST['additional_accomm']));
+        $frm_data = filteration($_POST);
+        $flag = 0;
+
+        $q1 = "UPDATE `rooms` SET `name`=?,`area`=?,`price`=?,`quantity`=?,`adult`=?,`children`=?,`detail`=? WHERE `id`=?";
+        $values = [$frm_data['name'], $frm_data['area'], $frm_data['price'], $frm_data['quantity'], $frm_data['adult'], $frm_data['children'], $frm_data['detail'], $frm_data['room_id']];
+
+        if(update($q1, $values, 'siiiiisi')){
+            $flag = 1;
+        }
         
+        $delete_accommodation = delete("DELETE FROM `room_accommodation` WHERE `room_id`=?", [$frm_data['room_id']], 'i');
+        $delete_additionalAccomm = delete("DELETE FROM `room_additionalAccom` WHERE `room_id`=?", [$frm_data['room_id']], 'i');
+
+        if(!($delete_accommodation && $delete_additionalAccomm)){
+            $flag = 0;
+        }
+
+        $q2 = "INSERT INTO `room_accommodation`(`room_id`, `accommodation_id`) VALUES (?, ?)";
+
+        if($stmt = mysqli_prepare($con, $q2)){
+            foreach($accommodation as $a){
+                mysqli_stmt_bind_param($stmt, 'ii', $frm_data['room_id'], $a);
+                mysqli_stmt_execute($stmt);
+            }
+            $flag = 1;
+            mysqli_stmt_close($stmt);
+        } else{
+            $flag = 0;
+            die('Query cannot be prepared - insert');
+        }
+
+        //room additional accommodation
+        $q3 = "INSERT INTO `room_additionalAccom`(`room_id`, `additionalAccom_id`) VALUES (?, ?)";
+
+        if($stmt = mysqli_prepare($con, $q3)){
+            foreach($additional_accomm as $a){
+                mysqli_stmt_bind_param($stmt, 'ii', $frm_data['room_id'], $a);
+                mysqli_stmt_execute($stmt);
+            }
+            $flag = 1;
+            mysqli_stmt_close($stmt);
+        } else{
+            $flag = 0;
+            die('Query cannot be prepared - insert');
+        }
+
+        if($flag){
+            echo 1;
+        } else{
+            echo 0;
+        }
     }
 
     if(isset($_POST['toggleStatus'])){