diff --git a/admin-dev/themes/default/template/controllers/products/configuration.tpl b/admin-dev/themes/default/template/controllers/products/configuration.tpl index 5e9a836e7..750b37d2c 100644 --- a/admin-dev/themes/default/template/controllers/products/configuration.tpl +++ b/admin-dev/themes/default/template/controllers/products/configuration.tpl @@ -2005,7 +2005,7 @@ $('#connected_room_title').html(''); } } else { - alert(response.message); + showErrorMessage(response.message); } } }); @@ -2016,7 +2016,7 @@ var connectedRoomId = $row.find('.connect-room').val(); if (!connectedRoomId) { - alert(selectRoomText); + showErrorMessage(selectRoomText); return; } $.ajax({ @@ -2043,7 +2043,7 @@ $icon.text(response.connected_count); } } else { - alert(response.message); + showErrorMessage(response.message); } }, complete: function() { @@ -2132,7 +2132,7 @@ $icon.text(response.connected_count); } } else { - alert(response.message); + showErrorMessage(response.message); } } }); diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index fadff8717..b971d2b27 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -5720,6 +5720,19 @@ class AdminProductsControllerCore extends AdminController $idHotel = (int) $objRoom->id_hotel; if ($mode === 'add') { + if (!Validate::isLoadedObject($objRoom)) { + die(json_encode(['success' => false, 'message' => $this->l('Invalid room selected.')])); + } + + $objConnectedRoom = new HotelRoomInformation($connectedRoomId); + if ( + $connectedRoomId === $roomId + || !Validate::isLoadedObject($objConnectedRoom) + || (int) $objConnectedRoom->id_hotel !== $idHotel + ) { + die(json_encode(['success' => false, 'message' => $this->l('Invalid room selected for connection.')])); + } + $connection = new HotelConnectedRoom(); $connection->id_room = $roomId; $connection->id_room_connected = $connectedRoomId;