From dcb6228bded109648bb2a9b5b8beb8500ffe15c9 Mon Sep 17 00:00:00 2001 From: varun kewlani Date: Fri, 10 Jul 2026 13:01:51 +0530 Subject: [PATCH] Updated: funciton names and logic for fetching amenities in Hotelamenities controller Co-authored-by: Name --- classes/Product.php | 2 +- controllers/admin/AdminFeaturesController.php | 2 +- controllers/admin/AdminProductsController.php | 14 ++-- .../classes/HotelAmenities.php | 68 ++++++++----------- .../classes/HotelBranchAmenities.php | 4 +- .../classes/HotelRoomTypeAmenities.php | 4 +- .../admin/AdminAddHotelController.php | 4 +- .../admin/AdminHotelAmenitiesController.php | 2 +- 8 files changed, 43 insertions(+), 57 deletions(-) diff --git a/classes/Product.php b/classes/Product.php index 805d6e372..038d34b85 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -6879,7 +6879,7 @@ class ProductCore extends ObjectModel * @param int $idLang defaults to current context language * @return array */ - public static function getRoomTypeFeatureData($idProduct, $idLang = 0) + public static function getRoomTypeFeatureTreeData($idProduct, $idLang = 0) { if (!$idLang) { $idLang = Context::getContext()->language->id; diff --git a/controllers/admin/AdminFeaturesController.php b/controllers/admin/AdminFeaturesController.php index ad2df2e4d..56e866863 100644 --- a/controllers/admin/AdminFeaturesController.php +++ b/controllers/admin/AdminFeaturesController.php @@ -97,8 +97,8 @@ class AdminFeaturesControllerCore extends AdminController */ public function renderList() { - $this->addRowAction('edit'); $this->addRowAction('view'); + $this->addRowAction('edit'); $this->addRowAction('delete'); return parent::renderList(); diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index fee91601b..fe5fe48d5 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -1139,7 +1139,7 @@ class AdminProductsControllerCore extends AdminController } if (Validate::isLoadedObject($product = new Product((int)Tools::getValue('id_product')))) { - if (!$this->saveRoomTypeFeatureAssignments($product)) { + if (!$this->saveRoomTypeFeatures($product)) { $this->errors[] = Tools::displayError('An error occurred while saving room type features.'); } } else { @@ -1154,7 +1154,7 @@ class AdminProductsControllerCore extends AdminController * * @return bool */ - protected function saveRoomTypeFeatureAssignments(Product $product) + protected function saveRoomTypeFeatures(Product $product) { $product->deleteFeatures(); @@ -1939,7 +1939,7 @@ class AdminProductsControllerCore extends AdminController $this->assignRoomType($this->object); if ($this->isTabSubmitted('Amenities')) { $categories = HotelAmenities::getCategories(); - if ($categories && !HotelAmenities::hasAmenityItems()) { + if ($categories && !HotelAmenities::getAmenities()) { $this->errors[] = Tools::displayError('No amenities have been created. Please add amenities to at least one category before assigning them.'); return false; } @@ -1950,7 +1950,7 @@ class AdminProductsControllerCore extends AdminController return false; } } - if ($this->isTabSubmitted('Features') && !$this->saveRoomTypeFeatureAssignments($this->object)) { + if ($this->isTabSubmitted('Features') && !$this->saveRoomTypeFeatures($this->object)) { $this->errors[] = Tools::displayError('An error occurred while saving room type features.'); return false; } @@ -2204,7 +2204,7 @@ class AdminProductsControllerCore extends AdminController return false; } } - if ($this->isTabSubmitted('Features') && !$this->saveRoomTypeFeatureAssignments($object)) { + if ($this->isTabSubmitted('Features') && !$this->saveRoomTypeFeatures($object)) { $this->errors[] = Tools::displayError('An error occurred while saving room type features.'); return false; } @@ -4865,7 +4865,7 @@ class AdminProductsControllerCore extends AdminController } else { if ($obj->id) { if ($this->product_exists_in_shop) { - $features = Product::getRoomTypeFeatureData($obj->id); + $features = Product::getRoomTypeFeatureTreeData($obj->id); if ($features) { $tree = new HelperTree('room-type-features-tree', $features); $tree->setShowCollapseExpandButton(true) @@ -4911,7 +4911,7 @@ class AdminProductsControllerCore extends AdminController if ($obj->id) { if ($this->product_exists_in_shop) { - $roomTypeAmenities = HotelRoomTypeAmenities::getRoomTypeAmenitiesData((int) $obj->id); + $roomTypeAmenities = HotelRoomTypeAmenities::getRoomTypeAmenitiesTreeData((int) $obj->id); if ($roomTypeAmenities) { $tree = new HelperTree('room-type-amenities-tree', $roomTypeAmenities); $tree->setShowCollapseExpandButton(true) diff --git a/modules/hotelreservationsystem/classes/HotelAmenities.php b/modules/hotelreservationsystem/classes/HotelAmenities.php index 9fdf20d52..0087ccffb 100644 --- a/modules/hotelreservationsystem/classes/HotelAmenities.php +++ b/modules/hotelreservationsystem/classes/HotelAmenities.php @@ -68,64 +68,50 @@ class HotelAmenities extends ObjectModel return false; } - /** - * Returns true if at least one amenity item (child) exists in any category. - * - * @return bool - */ - public static function hasAmenityItems() - { - return (bool) Db::getInstance()->getValue( - 'SELECT COUNT(*) FROM `'._DB_PREFIX_.'htl_amenity` WHERE `id_parent` != 0' - ); - } - /** * Return all categories (id_parent = 0) with their child amenities. * * @param int $idLang * @return array|false */ - public function getAllAmenitiesTree($idLang = 0) + public function getAmenitiesTree($idLang = 0) { if (!$idLang) { $idLang = Context::getContext()->language->id; } - $result = array(); - $parents = Db::getInstance()->executeS( - 'SELECT ha.`id_amenity`, ha.`position`, hal.`name` + $rows = Db::getInstance()->executeS( + 'SELECT ha.`id_amenity`, ha.`id_parent`, ha.`position`, ha.`active`, ha.`logo_type`, ha.`logo`, hal.`name` FROM `'._DB_PREFIX_.'htl_amenity` ha LEFT JOIN `'._DB_PREFIX_.'htl_amenity_lang` hal ON (hal.`id_amenity` = ha.`id_amenity` AND hal.`id_lang` = '.(int)$idLang.') - WHERE ha.`id_parent` = 0 - ORDER BY ha.`position` ASC' + ORDER BY ha.`id_parent` ASC, ha.`position` ASC' ); - if ($parents) { - foreach ($parents as $parent) { - $result[$parent['id_amenity']] = array( - 'id' => $parent['id_amenity'], - 'name' => $parent['name'], - 'position' => $parent['position'], + if (!$rows) { + return false; + } + + $result = array(); + $amenitiesByCategory = array(); + + foreach ($rows as $row) { + if ($row['id_parent'] == 0) { + $result[$row['id_amenity']] = array( + 'id' => $row['id_amenity'], + 'name' => $row['name'], + 'position' => $row['position'], 'children' => array(), ); + } else { + $row['id'] = $row['id_amenity']; + $amenitiesByCategory[$row['id_parent']][] = $row; + } + } - $children = Db::getInstance()->executeS( - 'SELECT ha.`id_amenity`, ha.`active`, ha.`logo_type`, ha.`logo`, hal.`name` - FROM `'._DB_PREFIX_.'htl_amenity` ha - LEFT JOIN `'._DB_PREFIX_.'htl_amenity_lang` hal - ON (hal.`id_amenity` = ha.`id_amenity` AND hal.`id_lang` = '.(int)$idLang.') - WHERE ha.`id_parent` = '.(int)$parent['id_amenity'] - ); - - if ($children) { - // normalize: rename id_amenity → id for template compatibility - foreach ($children as &$child) { - $child['id'] = $child['id_amenity']; - } - $result[$parent['id_amenity']]['children'] = $children; - } + foreach ($amenitiesByCategory as $categoryId => $amenities) { + if (isset($result[$categoryId])) { + $result[$categoryId]['children'] = $amenities; } } @@ -139,7 +125,7 @@ class HotelAmenities extends ObjectModel * @param int $idLang * @return array|false */ - public function hotelBranchSelectedAmenitiesArray($selectedIds, $idLang = 0) + public function hotelBranchSelectedAmenities($selectedIds, $idLang = 0) { if (!$idLang) { $idLang = Context::getContext()->language->id; @@ -175,7 +161,7 @@ class HotelAmenities extends ObjectModel } } - return $result ?: false; + return $result; } /** diff --git a/modules/hotelreservationsystem/classes/HotelBranchAmenities.php b/modules/hotelreservationsystem/classes/HotelBranchAmenities.php index 62627a26d..66a3d4b47 100644 --- a/modules/hotelreservationsystem/classes/HotelBranchAmenities.php +++ b/modules/hotelreservationsystem/classes/HotelBranchAmenities.php @@ -77,14 +77,14 @@ class HotelBranchAmenities extends ObjectModel * @param int $idLang defaults to current context language * @return array */ - public static function getBranchAmenitiesData($idHotel, $idLang = 0) + public static function getBranchAmenitiesTreeData($idHotel, $idLang = 0) { if (!$idLang) { $idLang = Context::getContext()->language->id; } $objHotelAmenities = new HotelAmenities(); - $amenities = $objHotelAmenities->hotelBranchSelectedAmenitiesArray( + $amenities = $objHotelAmenities->hotelBranchSelectedAmenities( array_column(self::getAmenities($idHotel), 'id'), $idLang ); diff --git a/modules/hotelreservationsystem/classes/HotelRoomTypeAmenities.php b/modules/hotelreservationsystem/classes/HotelRoomTypeAmenities.php index 556c91fa0..68904cbf6 100644 --- a/modules/hotelreservationsystem/classes/HotelRoomTypeAmenities.php +++ b/modules/hotelreservationsystem/classes/HotelRoomTypeAmenities.php @@ -86,14 +86,14 @@ class HotelRoomTypeAmenities extends ObjectModel * @param int $idLang defaults to current context language * @return array */ - public static function getRoomTypeAmenitiesData($idProduct, $idLang = 0) + public static function getRoomTypeAmenitiesTreeData($idProduct, $idLang = 0) { if (!$idLang) { $idLang = Context::getContext()->language->id; } $objHotelAmenities = new HotelAmenities(); - $amenities = $objHotelAmenities->hotelBranchSelectedAmenitiesArray( + $amenities = $objHotelAmenities->hotelBranchSelectedAmenities( array_column(self::getAmenities($idProduct), 'id'), $idLang ); diff --git a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php index 03b61125f..020227614 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php @@ -176,7 +176,7 @@ class AdminAddHotelController extends ModuleAdminController } $smartyVars['order_restrict_date_info'] = HotelOrderRestrictDate::getDataByHotelId($idHotel); - if ($amenities = HotelBranchAmenities::getBranchAmenitiesData((int)$idHotel)) { + if ($amenities = HotelBranchAmenities::getBranchAmenitiesTreeData((int)$idHotel)) { $tree = new HelperTree('hotel-amenities-tree', $amenities); $tree->setShowCollapseExpandButton(true) ->setUseCheckBox(true) @@ -478,7 +478,7 @@ class AdminAddHotelController extends ModuleAdminController } $amenityCategories = HotelAmenities::getCategories(); - if ($amenityCategories && !HotelAmenities::hasAmenityItems()) { + if ($amenityCategories && !HotelAmenities::getAmenities()) { $this->errors[] = $this->l('No amenities have been created. Please add amenities to at least one category before assigning them.'); } diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelAmenitiesController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelAmenitiesController.php index e75a4ab5f..6001b3546 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelAmenitiesController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelAmenitiesController.php @@ -83,7 +83,7 @@ class AdminHotelAmenitiesController extends ModuleAdminController { $objHotelAmenities = new HotelAmenities(); $this->context->smarty->assign(array( - 'amenities_tree' => $objHotelAmenities->getAllAmenitiesTree(), + 'amenities_tree' => $objHotelAmenities->getAmenitiesTree(), 'img_base_url' => $this->module->getPathUri().self::IMG_DIR, 'current_index' => self::$currentIndex, 'token' => $this->token,