From b492f2a771a5dd5be66847916ef1ec58032297ed Mon Sep 17 00:00:00 2001 From: azhar bhat Date: Mon, 24 Feb 2025 19:48:43 +0530 Subject: [PATCH 1/3] Fixed the issue where the Extra Information field value was being stored in Floor while adding a room. --- .../default/template/controllers/products/configuration.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/themes/default/template/controllers/products/configuration.tpl b/admin/themes/default/template/controllers/products/configuration.tpl index 61e5e168d..21e63328b 100644 --- a/admin/themes/default/template/controllers/products/configuration.tpl +++ b/admin/themes/default/template/controllers/products/configuration.tpl @@ -409,7 +409,7 @@ html += ''; html += ''; html += ''; - html += ''; + html += ''; html += ''; html += ''; html += ''; From 60a411b0c3d99024f2c4b1482a15993023730ee1 Mon Sep 17 00:00:00 2001 From: azhar bhat Date: Tue, 25 Feb 2025 18:50:35 +0530 Subject: [PATCH 2/3] validation added --- controllers/admin/AdminProductsController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index d31f6b3f4..0f3d01465 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -3499,8 +3499,8 @@ class AdminProductsControllerCore extends AdminController $objHotelRoomInfo->id_hotel = $id_hotel; $objHotelRoomInfo->room_num = $roomInfo['room_num']; $objHotelRoomInfo->id_status = $roomInfo['id_status']; - $objHotelRoomInfo->floor = $roomInfo['floor']; - $objHotelRoomInfo->comment = $roomInfo['comment']; + $objHotelRoomInfo->floor = trim($roomInfo['floor']); + $objHotelRoomInfo->comment = trim($roomInfo['comment']); if ($objHotelRoomInfo->save() && $objHotelRoomInfo->id_status != HotelRoomInformation::STATUS_TEMPORARY_INACTIVE ) { @@ -3536,7 +3536,7 @@ class AdminProductsControllerCore extends AdminController } } - if ($roomInfo['room_num'] && !Validate::isGenericName($roomInfo['room_num'])) { + if (empty(trim($roomInfo['room_num'])) || !Validate::isGenericName($roomInfo['room_num'])) { $this->errors[] = sprintf(Tools::displayError('Invalid room number for room %s.'), $roomIndex); } From fc13f9b2e0ad48992bb2c1c618b75a0fd4562ffb Mon Sep 17 00:00:00 2001 From: azhar bhat Date: Tue, 25 Feb 2025 19:02:52 +0530 Subject: [PATCH 3/3] added trim for room num --- controllers/admin/AdminProductsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 0f3d01465..3dc7ccdda 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -3497,7 +3497,7 @@ class AdminProductsControllerCore extends AdminController } $objHotelRoomInfo->id_product = $id_product; $objHotelRoomInfo->id_hotel = $id_hotel; - $objHotelRoomInfo->room_num = $roomInfo['room_num']; + $objHotelRoomInfo->room_num = trim($roomInfo['room_num']); $objHotelRoomInfo->id_status = $roomInfo['id_status']; $objHotelRoomInfo->floor = trim($roomInfo['floor']); $objHotelRoomInfo->comment = trim($roomInfo['comment']);