Merge pull request #1861 from amitsharma322/gli-3166
Fixed: Validate hotel association when connecting rooms in Manage Room Type in the back office
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user