diff --git a/admin/themes/default/template/controllers/products/configuration.tpl b/admin/themes/default/template/controllers/products/configuration.tpl index d9baf5166..92ca90429 100644 --- a/admin/themes/default/template/controllers/products/configuration.tpl +++ b/admin/themes/default/template/controllers/products/configuration.tpl @@ -23,7 +23,7 @@ {if isset($product->id)}
-

{$htl_room_type['multiple_room_type_selling_object']}

+

{$htl_room_type['selling_object_plural_name']}

@@ -34,35 +34,35 @@ @@ -70,8 +70,8 @@ @@ -224,14 +224,14 @@
  • -  {l s='Create %s' sprintf=$htl_room_type['multiple_room_type_selling_object']} +  {l s='Create %s' sprintf=$htl_room_type['selling_object_plural_name']}
    • @@ -276,7 +276,7 @@
    @@ -348,7 +348,7 @@ -

      {l s='Bulk Update %s' sprintf=$htl_room_type['multiple_room_type_selling_object']}

    +

      {l s='Bulk Update %s' sprintf=$htl_room_type['selling_object_plural_name']}

    @@ -424,13 +424,13 @@ -

      {l s='Bulk Create %s' sprintf=$htl_room_type['multiple_room_type_selling_object']}

    +

      {l s='Bulk Create %s' sprintf=$htl_room_type['selling_object_plural_name']}

    -

    {l s='If both the Room Prefix and Starting Room No. fields are left blank, the room name will be generated using the acronym of the Room Type name.'}

    +

    {l s='If both the %s Prefix and Starting %s No. fields are left blank, the %s name will be generated using the acronym of the Room Type name.' sprintf=array($htl_room_type['selling_object_name'], $htl_room_type['selling_object_plural_name'], $htl_room_type['selling_object_name'])}

    {l s='Example:'} {l s='For the Room Type'} @@ -441,7 +441,7 @@

    @@ -449,7 +449,7 @@
    @@ -457,7 +457,7 @@
    @@ -593,13 +593,13 @@
  • - {l s='Make %s Available' sprintf=$htl_room_type['room_type_selling_object']} + {l s='Make %s Available' sprintf=$htl_room_type['selling_object_name']}
  • - {l s='Disable %s' sprintf=$htl_room_type['room_type_selling_object']} + {l s='Disable %s' sprintf=$htl_room_type['selling_object_name']}
    • @@ -1606,7 +1606,7 @@ $('#deactiveDatesModal').attr('data-room-row-index', roomRowIndex); $('#deactiveDatesModal').attr('data-id-room', idRoom); if ($.trim(roomNum) != '') { - roomNum = '( '+'{l s='%s No' sprintf=$htl_room_type['multiple_room_type_selling_object']}'+' '+roomNum+')'; + roomNum = '( '+'{l s='%s No' sprintf=$htl_room_type['selling_object_plural_name']}'+' '+roomNum+')'; } $('#deactiveDatesModal .disable_dates_room_num').html(roomNum); diff --git a/admin/themes/default/template/controllers/products/informations.tpl b/admin/themes/default/template/controllers/products/informations.tpl index b4cae49b3..0293b194c 100644 --- a/admin/themes/default/template/controllers/products/informations.tpl +++ b/admin/themes/default/template/controllers/products/informations.tpl @@ -465,17 +465,17 @@
    {/if} - {if isset($room_type_selling_object_info) && $room_type_selling_object_info} + {if isset($selling_object_info) && $selling_object_info}
    - + {foreach from=$selling_object_info item=selling_object_type} + {/foreach}
    diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index b70f43991..5585e5508 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -882,13 +882,16 @@ abstract class PaymentModuleCore extends Module $objBookingDetail->zipcode = $hotelAddress['postcode']; $objBookingDetail->phone = $hotelAddress['phone']; } + $objBookingDetail->property_type_name = $objHotelBranch->propertyTypeName; + + } // Save room selling object and property type names as they are at the time of order creation if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($idProduct, $idLang)) { - $objBookingDetail->room_type_selling_object_name = $roomTypeInfo['room_type_selling_object'].'|'.$roomTypeInfo['multiple_room_type_selling_object']; + $objBookingDetail->selling_object_name = $roomTypeInfo['selling_object_name']; + $objBookingDetail->selling_object_plural_name = $roomTypeInfo['selling_object_plural_name']; } - $objBookingDetail->property_type_name = HotelPropertyType::getPropertyType($objCartBookingData->id_hotel, $idLang); /*for saving details of the advance payment product wise*/ $objBookingDetail->total_paid_amount = $total_price['total_price_tax_incl']; diff --git a/classes/Product.php b/classes/Product.php index c98feac95..8789efce4 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -56,6 +56,13 @@ class ProductCore extends ObjectModel /** @var string Manufacturer name */ public $manufacturer_name; + /** @var string Room Type Selling Object name */ + public $selling_object_name; + + /** @var string Room Type Selling Object plural name */ + public $selling_object_plural_name; + + /** @var string Supplier name */ public $supplier_name; @@ -247,7 +254,7 @@ class ProductCore extends ObjectModel public $is_virtual; public $booking_product; public $id_pack_product_attribute; - public $id_room_type_selling_object; + public $id_selling_object; public $cache_default_attribute; /** @@ -342,7 +349,7 @@ class ProductCore extends ObjectModel 'show_price' => array('type' => self::TYPE_BOOL, 'shop' => true, 'validate' => 'isBool'), 'indexed' => array('type' => self::TYPE_BOOL, 'shop' => true, 'validate' => 'isBool'), 'visibility' => array('type' => self::TYPE_STRING, 'shop' => true, 'validate' => 'isProductVisibility', 'values' => array('both', 'catalog', 'search', 'none'), 'default' => 'both'), - 'id_room_type_selling_object' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => false), + 'id_selling_object' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => false), 'cache_default_attribute' => array('type' => self::TYPE_INT, 'shop' => true), 'advanced_stock_management' => array('type' => self::TYPE_BOOL, 'shop' => true, 'validate' => 'isBool'), 'date_add' => array('type' => self::TYPE_DATE, 'shop' => true, 'validate' => 'isDate'), @@ -587,6 +594,9 @@ class ProductCore extends ObjectModel $this->tax_name = 'deprecated'; // The applicable tax may be BOTH the product one AND the state one (moreover this variable is some deadcode) $this->manufacturer_name = Manufacturer::getNameById((int)$this->id_manufacturer); $this->supplier_name = Supplier::getNameById((int)$this->id_supplier); + $sellingObject = RoomTypeSellingObject::getRoomTypeSellingObjectBySellingObjectId((int)$this->id_selling_object, (int)$id_lang); + $this->selling_object_name = $sellingObject ? $sellingObject['name'] : null; + $this->selling_object_plural_name = $sellingObject ? $sellingObject['plural_name'] : null; $address = null; $id_address = Cart::getIdAddressForTaxCalculation($this->id); $this->tax_rate = $this->getTaxesRate(new Address($id_address)); diff --git a/classes/RoomTypeSellingObject.php b/classes/RoomTypeSellingObject.php index 6acf32b73..61b98b6be 100644 --- a/classes/RoomTypeSellingObject.php +++ b/classes/RoomTypeSellingObject.php @@ -45,17 +45,38 @@ class RoomTypeSellingObjectCore extends ObjectModel public function isUsed() { return (bool) Db::getInstance()->getValue( - 'SELECT COUNT(*) FROM `'._DB_PREFIX_.'product` WHERE `id_room_type_selling_object` = '.(int) $this->id + 'SELECT COUNT(*) FROM `'._DB_PREFIX_.'product` WHERE `id_selling_object` = '.(int) $this->id ); } - public static function getRoomTypeSellingObject($idLang = null, $active = true) + public static function getRoomTypeSellingObjectBySellingObjectId($idSellingObject = null, $idLang = null) { if (!$idLang) { $idLang = Context::getContext()->language->id; } - $cache_key = 'RoomTypeSellingObject::getRoomTypeSellingObject'.(int)$idLang.'_'.(int)$active; + $cache_key = 'RoomTypeSellingObject::getRoomTypeSellingObjectBySellingObjectId_'.(int)$idSellingObject.'_'.(int)$idLang; + if (!Cache::isStored($cache_key)) { + $sql = 'SELECT hrstl.`name`, hrstl.`plural_name` + FROM `'._DB_PREFIX_.'room_type_selling_object` hrst + LEFT JOIN `'._DB_PREFIX_.'room_type_selling_object_lang` hrstl + ON (hrst.`id_room_type_selling_object` = hrstl.`id_room_type_selling_object` + AND hrstl.`id_lang` = '.(int)$idLang.') + WHERE hrst.`id_room_type_selling_object` = '.(int)$idSellingObject; + $res = Db::getInstance()->getRow($sql); + Cache::store($cache_key, $res); + } + + return Cache::retrieve($cache_key); + } + + public static function getRoomTypeSellingObjects($idLang = null, $active = true) + { + if (!$idLang) { + $idLang = Context::getContext()->language->id; + } + + $cache_key = 'RoomTypeSellingObject::getRoomTypeSellingObjects'.(int)$idLang.'_'.(int)$active; if (!Cache::isStored($cache_key)) { $sql = 'SELECT hrst.`id_room_type_selling_object` AS `id_room_type_selling_object`, hrstl.`name`, hrstl.`plural_name` FROM `'._DB_PREFIX_.'room_type_selling_object` hrst diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 6b1e2dd07..8fb96db3a 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -5443,14 +5443,16 @@ class AdminOrdersControllerCore extends AdminController $objBookingDetail->email = $objHotelBranch->email; $objBookingDetail->check_in_time = $objHotelBranch->check_in; $objBookingDetail->check_out_time = $objHotelBranch->check_out; + $objBookingDetail->property_type_name = $objHotelBranch->propertyTypeName; + } if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($idProduct, $idLang)) { $objBookingDetail->adults = $objCartBookingData->adults; $objBookingDetail->children = $objCartBookingData->children; $objBookingDetail->child_ages = $objCartBookingData->child_ages; - $objBookingDetail->room_type_selling_object_name = $roomTypeInfo['room_type_selling_object'].'|'.$roomTypeInfo['multiple_room_type_selling_object']; + $objBookingDetail->selling_object_name = $roomTypeInfo['selling_object_name']; + $objBookingDetail->selling_object_plural_name = $roomTypeInfo['selling_object_plural_name']; } - $objBookingDetail->property_type_name = HotelPropertyType::getPropertyType($objCartBookingData->id_hotel, $idLang); if ($objBookingDetail->save()) { $objRoomTypeServiceProduct = new RoomTypeServiceProduct(); diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index ff284970a..6f9955049 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -2178,6 +2178,8 @@ class AdminProductsControllerCore extends AdminController $objHotelRoomTypeBedType = new HotelRoomTypeBedType(); $objHotelRoomTypeBedType->updateRoomTypeBedTypes(Tools::getValue('id_bed_types'), $object->id); + $this->assignRoomType($object); + // update position in category $object->setPositionInCategory(Tools::getValue('category_position')); @@ -2348,7 +2350,7 @@ class AdminProductsControllerCore extends AdminController $saveShort = Tools::getValue('description_short'); $_POST['description_short'] = strip_tags(Tools::getValue('description_short')); } - $_POST['id_room_type_selling_object'] = Tools::getValue('id_room_type_selling_object') ?? 0; + $_POST['id_selling_object'] = Tools::getValue('id_selling_object') ?? 0; // Check description short size without html $limit = (int)Configuration::get('PS_SHORT_DESC_LIMIT'); @@ -3115,8 +3117,12 @@ class AdminProductsControllerCore extends AdminController if (Validate::isLoadedObject($product)) { if ($id_hotel = Tools::getValue('id_hotel')) { $objRoomType = new HotelRoomType(); + if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($product->id)) { + $objRoomType = new HotelRoomType((int)$roomTypeInfo['id']); + } $objRoomType->id_product = $product->id; $objRoomType->id_hotel = $id_hotel; + $objRoomType->id_selling_object = (int)$product->id_selling_object; $objRoomType->save(); } } @@ -4611,10 +4617,10 @@ class AdminProductsControllerCore extends AdminController $data->assign('selected_bed_types', $selectedBedTypes); } - $roomTypeSellingObjects = RoomTypeSellingObject::getRoomTypeSellingObject($this->context->language->id); - $data->assign('room_type_selling_object_info', $roomTypeSellingObjects); - if (!empty($product->id_room_type_selling_object)) { - $data->assign('selected_room_type_selling_object', $product->id_room_type_selling_object); + $roomTypeSellingObjects = RoomTypeSellingObject::getRoomTypeSellingObjects($this->context->language->id); + $data->assign('selling_object_info', $roomTypeSellingObjects); + if (!empty($product->id_selling_object)) { + $data->assign('selected_room_type_selling_object', $product->id_selling_object); } $this->tpl_form_vars['product'] = $product; @@ -5597,15 +5603,15 @@ class AdminProductsControllerCore extends AdminController if (!empty($roomNumber = trim(Tools::getValue('num'))) && !Validate::isUnsignedInt($roomNumber) ) { - $this->errors[] = sprintf(Tools::displayError('Invalid Starting %s No.') , $roomTypeInfo['room_type_selling_object']); + $this->errors[] = sprintf(Tools::displayError('Invalid Starting %s No.') , $roomTypeInfo['selling_object_name']); } if (!($roomQuantity = Tools::getValue('qty'))) { - $this->errors[] = sprintf(Tools::displayError('Number of %s is required.') ,$roomTypeInfo['room_type_selling_object']); + $this->errors[] = sprintf(Tools::displayError('Number of %s is required.') ,$roomTypeInfo['selling_object_name']); } else if (!Validate::isUnsignedInt($roomQuantity) || $roomQuantity < 1) { - $this->errors[] = sprintf(Tools::displayError('Invalid value for number of %s.') ,$roomTypeInfo['room_type_selling_object']); + $this->errors[] = sprintf(Tools::displayError('Invalid value for number of %s.') ,$roomTypeInfo['selling_object_name']); } else if ($roomQuantity > 50) { - $this->errors[] = sprintf(Tools::displayError('You cannot create more than 50 %s at a time.'), $roomTypeInfo['room_type_selling_object']); + $this->errors[] = sprintf(Tools::displayError('You cannot create more than 50 %s at a time.'), $roomTypeInfo['selling_object_name']); } if (trim($comment = Tools::getValue('room_comment'))) { @@ -5618,7 +5624,7 @@ class AdminProductsControllerCore extends AdminController $disableDates = Tools::getValue('disable_dates'); $roomsInfo['disable_dates_json'] = json_encode($disableDates); if (!$disableDates) { - $this->errors[] = sprintf(Tools::displayError('Please add at least one date range for updating the %s status to temporary inactive.') , $roomTypeInfo['room_type_selling_object']); + $this->errors[] = sprintf(Tools::displayError('Please add at least one date range for updating the %s status to temporary inactive.') , $roomTypeInfo['selling_object_name']); } else { $hasMissingRowError = false; foreach ($disableDates as $key => $dateRange) { diff --git a/controllers/front/OrderConfirmationController.php b/controllers/front/OrderConfirmationController.php index 1fdd09ef1..27f79fd09 100644 --- a/controllers/front/OrderConfirmationController.php +++ b/controllers/front/OrderConfirmationController.php @@ -184,10 +184,9 @@ class OrderConfirmationControllerCore extends FrontController $cart_htl_data[$type_key]['children'] = $rm_dtl['children']; // Prefer the name stored at order-creation time so it stays historically accurate - if (!empty($order_bk_data[0]['room_type_selling_object_name'])) { - $sellingObjectNames = explode('|', $order_bk_data[0]['room_type_selling_object_name']); - $cart_htl_data[$type_key]['room_type_selling_object'] = $sellingObjectNames[0]; - $cart_htl_data[$type_key]['multiple_room_type_selling_object'] = $sellingObjectNames[1]; + if (!empty($order_bk_data[0]['selling_object_name'])) { + $cart_htl_data[$type_key]['selling_object_name'] = $order_bk_data[0]['selling_object_name']; + $cart_htl_data[$type_key]['selling_object_plural_name'] = $order_bk_data[0]['selling_object_plural_name']; } foreach ($order_bk_data as $data_k => $data_v) { diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php index 8f50de38a..2eb4eece8 100644 --- a/controllers/front/OrderDetailController.php +++ b/controllers/front/OrderDetailController.php @@ -134,10 +134,9 @@ class OrderDetailControllerCore extends FrontController $cartHotelData[$type_key]['cover_img'] = $type_value['cover_img']; // Prefer the name stored at order-creation time so it stays historically accurate - if (!empty($order_bk_data[0]['room_type_selling_object_name'])) { - $sellingObjectNames = explode('|', $order_bk_data[0]['room_type_selling_object_name']); - $cartHotelData[$type_key]['room_type_selling_object'] = $sellingObjectNames[0]; - $cartHotelData[$type_key]['multiple_room_type_selling_object'] = $sellingObjectNames[1]; + if (!empty($order_bk_data[0]['selling_object_name'])) { + $cartHotelData[$type_key]['selling_object_name'] = $order_bk_data[0]['selling_object_name']; + $cartHotelData[$type_key]['selling_object_plural_name'] = $order_bk_data[0]['selling_object_plural_name']; } diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php index 377f3c3af..cfd9405c0 100644 --- a/controllers/front/ProductController.php +++ b/controllers/front/ProductController.php @@ -333,15 +333,15 @@ class ProductControllerCore extends FrontController /*By webkul To send All needed Hotel Information on product.tpl*/ ##################################################################### - $htl_features = array(); + $htl_features = array(); $obj_hotel_room_type = new HotelRoomType(); $room_info_by_product_id = $obj_hotel_room_type->getRoomTypeInfoByIdProduct($this->product->id); if ($hotel_id = $room_info_by_product_id['id_hotel']) { - $obj_hotel_branch = new HotelBranchInformation(); + $obj_hotel_branch = new HotelBranchInformation($hotel_id); $hotel_info_by_id = $obj_hotel_branch->hotelBranchesInfo(false, 2, 1, $hotel_id); $hotel_policies = $hotel_info_by_id['policies']; $hotel_name = $hotel_info_by_id['hotel_name']; - $propertyType = HotelPropertyType::getPropertyType($hotel_id); + $propertyType = $obj_hotel_branch->propertyTypeName; $addressInfo = HotelBranchInformation::getAddress($room_info_by_product_id['id_hotel']); $hotel_location = $addressInfo['city']. ($addressInfo['id_state']?', '.$addressInfo['state']:'').', '.$addressInfo['country']; diff --git a/install/data/db_structure.sql b/install/data/db_structure.sql index 4f1738ebb..ff8850a67 100644 --- a/install/data/db_structure.sql +++ b/install/data/db_structure.sql @@ -1572,7 +1572,7 @@ CREATE TABLE `PREFIX_product` ( `cache_has_attachments` tinyint(1) NOT NULL DEFAULT '0', `is_virtual` tinyint(1) NOT NULL DEFAULT '0', `booking_product` tinyint(1) NOT NULL DEFAULT '1', - `id_room_type_selling_object` int(10) unsigned DEFAULT NULL, + `id_selling_object` int(10) unsigned DEFAULT NULL, `cache_default_attribute` int(10) unsigned DEFAULT NULL, `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, diff --git a/modules/blockcart/ajax-cart.js b/modules/blockcart/ajax-cart.js index 5022d288d..c0e2e67d3 100644 --- a/modules/blockcart/ajax-cart.js +++ b/modules/blockcart/ajax-cart.js @@ -1218,7 +1218,7 @@ var ajaxCart = { adults += parseInt(val.adults); children += parseInt(val.children); }); - product_quantity_text = getRoomTypeGuestOccupancyFormated(adults, children, rooms,product.room_info.room_type_selling_object, product.room_info.multiple_room_type_selling_object); + product_quantity_text = getRoomTypeGuestOccupancyFormated(adults, children, rooms,product.room_info.selling_object_name, product.room_info.selling_object_plural_name); } else { product_quantity_text = product.occupancy; } diff --git a/modules/blockcart/blockcart.php b/modules/blockcart/blockcart.php index 1ee45ba75..26a3d33d0 100644 --- a/modules/blockcart/blockcart.php +++ b/modules/blockcart/blockcart.php @@ -314,15 +314,15 @@ class Blockcart extends Module } $addedProduct['occupancy_required_for_booking'] = $occupancyRequiredForBooking; $addedProduct['layer_cart_attribute_label'] = $addedProduct['occupancy_required_for_booking'] - ? sprintf($this->l('%s occupancy'), $room_info['room_type_selling_object']) - : sprintf($this->l('%s quantity added'), $room_info['multiple_room_type_selling_object']); + ? sprintf($this->l('%s occupancy'), $room_info['selling_object_name']) + : sprintf($this->l('%s quantity added'), $room_info['selling_object_plural_name']); $price = $addedProduct['price'] = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice( $objProduct->id, $addedProduct['date_from'], $addedProduct['date_to'], $addedProduct['occupancy'] ); - $addedProduct['layer_cart_room_success_msg'] = sprintf($this->l('%s successfully added to your cart'), $room_info['room_type_selling_object']); + $addedProduct['layer_cart_room_success_msg'] = sprintf($this->l('%s successfully added to your cart'), $room_info['selling_object_name']); if ($priceDisplayMethod == PS_TAX_EXC) { $addedProduct['price'] = Tools::displayPrice($price['total_price_tax_excl']); } else { diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php index 4137a1a5e..9558c1415 100644 --- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php +++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php @@ -53,7 +53,8 @@ class HotelBookingDetail extends ObjectModel // hotel information/location/contact public $hotel_name; public $room_type_name; - public $room_type_selling_object_name; + public $selling_object_name; + public $selling_object_plural_name; public $property_type_name; public $city; public $state; @@ -120,7 +121,8 @@ class HotelBookingDetail extends ObjectModel // hotel information/location/contact 'room_num' => array('type' => self::TYPE_STRING, 'required' => true), 'room_type_name' => array('type' => self::TYPE_STRING, 'required' => true), - 'room_type_selling_object_name' => array('type' => self::TYPE_STRING), + 'selling_object_name' => array('type' => self::TYPE_STRING), + 'selling_object_plural_name' => array('type' => self::TYPE_STRING), 'property_type_name' => array('type' => self::TYPE_STRING), 'hotel_name' => array('type' => self::TYPE_STRING, 'required' => true), 'city' => array('type' => self::TYPE_STRING, 'validate' => 'isCityName', 'size' => 64, 'required' => true), diff --git a/modules/hotelreservationsystem/classes/HotelBranchInformation.php b/modules/hotelreservationsystem/classes/HotelBranchInformation.php index df821c092..51be79183 100644 --- a/modules/hotelreservationsystem/classes/HotelBranchInformation.php +++ b/modules/hotelreservationsystem/classes/HotelBranchInformation.php @@ -44,6 +44,7 @@ class HotelBranchInformation extends ObjectModel public $date_upd; public $moduleInstance; + public $propertyTypeName; public static $definition = array( 'table' => 'htl_branch_info', @@ -163,6 +164,7 @@ class HotelBranchInformation extends ObjectModel $this->use_global_min_booking_offset = $hotelRestrictions['use_global_min_booking_offset']; $this->min_booking_offset = $hotelRestrictions['min_booking_offset']; } + $this->propertyTypeName = self::getHotelPropertyTypeByPropertyId($this->id_property_type, $id_lang); } } @@ -1408,4 +1410,23 @@ class HotelBranchInformation extends ObjectModel return Db::getInstance()->executeS($sql); } + public static function getHotelPropertyTypeByPropertyId($idPropertyType, $idLang = null) + { + $idPropertyType = (int) $idPropertyType; + $idLang = $idLang ? (int) $idLang : (int) Context::getContext()->language->id; + $cacheKey = 'HotelPropertyType::getHotelPropertyTypeByPropertyId'.$idPropertyType.'_'.$idLang; + + if (!Cache::isStored($cacheKey)) { + $sql = 'SELECT hptl.`name` + FROM `'._DB_PREFIX_.'htl_property_type_lang` hptl + WHERE hptl.`id_htl_property_type` = '.$idPropertyType.' + AND hptl.`id_lang` = '.$idLang; + + Cache::store($cacheKey, Db::getInstance()->getValue($sql)); + } + + $propertyType = Cache::retrieve($cacheKey); + return $propertyType ? $propertyType : Module::getInstanceByName('hotelreservationsystem')->l('Hotel', 'HotelBranchInformation'); + } + } diff --git a/modules/hotelreservationsystem/classes/HotelCartBookingData.php b/modules/hotelreservationsystem/classes/HotelCartBookingData.php index 087d5b44f..311a1e4ac 100644 --- a/modules/hotelreservationsystem/classes/HotelCartBookingData.php +++ b/modules/hotelreservationsystem/classes/HotelCartBookingData.php @@ -1564,8 +1564,8 @@ class HotelCartBookingData extends ObjectModel $cartHotelData[$prodKey]['total_num_rooms'] = 0; $cartHotelData[$prodKey]['id_product'] = $product['id_product']; $cartHotelData[$prodKey]['name'] = $objProduct->name; - $cartHotelData[$prodKey]['room_type_selling_object'] = $roomDetail['room_type_selling_object']; - $cartHotelData[$prodKey]['multiple_room_type_selling_object'] = $roomDetail['multiple_room_type_selling_object']; + $cartHotelData[$prodKey]['selling_object_name'] = $roomDetail['selling_object_name']; + $cartHotelData[$prodKey]['selling_object_plural_name'] = $roomDetail['selling_object_plural_name']; $cartHotelData[$prodKey]['unit_price'] = $unitPrice; $cartHotelData[$prodKey]['unit_price_without_reduction'] = $unitPriceWithoutReduction; $cartHotelData[$prodKey]['total_room_type_amount'] = 0; diff --git a/modules/hotelreservationsystem/classes/HotelHelper.php b/modules/hotelreservationsystem/classes/HotelHelper.php index e73c58437..5f9256140 100644 --- a/modules/hotelreservationsystem/classes/HotelHelper.php +++ b/modules/hotelreservationsystem/classes/HotelHelper.php @@ -1402,7 +1402,7 @@ class HotelHelper return true; } - public function createHotelDefaultRoomSellingTypes() + public function createDefaultRoomSellingObjects() { $roomTypeSellingObjects = array( array( @@ -2171,7 +2171,7 @@ class HotelHelper $product->show_at_front = 1; $product->is_virtual = 1; $product->indexed = 1; - $product->id_room_type_selling_object= 1; + $product->id_selling_object = 1; $product->save(); $product_id = $product->id; @@ -2252,6 +2252,7 @@ class HotelHelper $htl_rm_type = new HotelRoomType(); $htl_rm_type->id_product = $product_id; $htl_rm_type->id_hotel = $id_hotel; + $htl_rm_type->id_selling_object = $product->id_selling_object; $htl_rm_type->adults = 2; $htl_rm_type->children = 2; $htl_rm_type->max_adults = 2; @@ -2661,7 +2662,7 @@ class HotelHelper $this->saveDummyProductsAndRelatedInfo($htl_id); $this->saveDummyServiceProductsAndRelatedInfo(); $this->createHotelDefaultPropertyTypes(); - $this->createHotelDefaultRoomSellingTypes(); + $this->createDefaultRoomSellingObjects(); return true; } diff --git a/modules/hotelreservationsystem/classes/HotelPropertyType.php b/modules/hotelreservationsystem/classes/HotelPropertyType.php index df7c64ce8..cbe87d79b 100644 --- a/modules/hotelreservationsystem/classes/HotelPropertyType.php +++ b/modules/hotelreservationsystem/classes/HotelPropertyType.php @@ -52,35 +52,6 @@ class HotelPropertyType extends ObjectModel ); } - /** - * Get the property type name of a hotel in the requested language. - * - * @param int|null $idHotel - * @param int|null $idLang - * - * @return string - */ - public static function getPropertyType($idHotel = null, $idLang = null) - { - $idHotel = (int) $idHotel; - $idLang = $idLang ? (int) $idLang : (int) Context::getContext()->language->id; - $cacheKey = 'HotelPropertyType::getPropertyType'.$idHotel.'_'.$idLang; - - if (!Cache::isStored($cacheKey)) { - $sql = 'SELECT hptl.`name` - FROM `'._DB_PREFIX_.'htl_branch_info` hbi - LEFT JOIN `'._DB_PREFIX_.'htl_property_type_lang` hptl - ON (hbi.`id_property_type` = hptl.`id_htl_property_type` - AND hptl.`id_lang` = '.$idLang.') - WHERE hbi.`id` = '.$idHotel; - - Cache::store($cacheKey, Db::getInstance()->getValue($sql)); - } - - $propertyType = Cache::retrieve($cacheKey); - $module = Module::getInstanceByName('hotelreservationsystem'); - return $propertyType ? $propertyType : $module->l('Hotel', 'HotelPropertyType'); - } /** * Get the list of property types in the requested language. diff --git a/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php b/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php index 08b68ac75..e9539f520 100644 --- a/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php +++ b/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php @@ -30,6 +30,7 @@ class HotelReservationSystemDb `id` int(11) NOT NULL AUTO_INCREMENT, `id_product` int(11) NOT NULL, `id_hotel` int(11) NOT NULL, + `id_selling_object` int(10) unsigned DEFAULT NULL, `adults` smallint(6) NOT NULL DEFAULT '2', `children` smallint(6) NOT NULL DEFAULT '0', `max_adults` smallint(6) NOT NULL DEFAULT '2', @@ -182,7 +183,8 @@ class HotelReservationSystemDb `is_back_order` tinyint(4) NOT NULL, `hotel_name` varchar(255) DEFAULT NULL, `room_type_name` varchar(255) DEFAULT NULL, - `room_type_selling_object_name` varchar(255) DEFAULT NULL, + `selling_object_name` varchar(255) DEFAULT NULL, + `selling_object_plural_name` varchar(255) DEFAULT NULL, `property_type_name` varchar(255) DEFAULT NULL, `city` varchar(255) NOT NULL, `state` varchar(255) DEFAULT NULL, diff --git a/modules/hotelreservationsystem/classes/HotelRoomType.php b/modules/hotelreservationsystem/classes/HotelRoomType.php index 29ec84544..807b1a2df 100644 --- a/modules/hotelreservationsystem/classes/HotelRoomType.php +++ b/modules/hotelreservationsystem/classes/HotelRoomType.php @@ -26,6 +26,7 @@ class HotelRoomType extends ObjectModel public $id; public $id_product; public $id_hotel; + public $id_selling_object; public $adults; public $children; public $max_adults; @@ -35,6 +36,8 @@ class HotelRoomType extends ObjectModel public $max_los; public $date_add; public $date_upd; + public $selling_object_name; + public $selling_object_plural_name; public static $definition = array( 'table' => 'htl_room_type', @@ -42,6 +45,7 @@ class HotelRoomType extends ObjectModel 'fields' => array( 'id_product' => array('type' => self::TYPE_INT, 'validate' => 'isInt'), 'id_hotel' => array('type' => self::TYPE_INT, 'validate' => 'isInt'), + 'id_selling_object' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => false), 'adults' => array('type' => self::TYPE_INT, 'validate' => 'isInt', 'default' => 2), 'children' => array('type' => self::TYPE_INT, 'validate' => 'isInt'), 'max_adults' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt', 'default' => 2), @@ -77,6 +81,14 @@ class HotelRoomType extends ObjectModel ), ); + public function __construct($id = null, $idLang = null, $idShop = null) + { + parent::__construct($id, $idLang, $idShop); + $module = Module::getInstanceByName('hotelreservationsystem'); + $this->selling_object_name = $module->l('Room', 'HotelRoomType'); + $this->selling_object_plural_name = $module->l('Rooms', 'HotelRoomType'); + } + /** * [duplicateRoomType :: duplicates room type]. * @@ -108,6 +120,7 @@ class HotelRoomType extends ObjectModel $objHotelRoomType = new HotelRoomType(); $objHotelRoomType->id_product = $idProductNew; $objHotelRoomType->id_hotel = $idHotelNew; + $objHotelRoomType->id_selling_object = $roomType['id_selling_object']; $objHotelRoomType->adults = $roomType['adults']; $objHotelRoomType->children = $roomType['children']; $objHotelRoomType->max_adults = $roomType['max_adults']; @@ -234,32 +247,31 @@ class HotelRoomType extends ObjectModel if (!$idLang) { $idLang = Context::getContext()->language->id; } + $cache_key = 'HotelRoomType::getRoomTypeInfoByIdProduct_'.$id_product.'_'.$idLang; + if (!Cache::isStored($cache_key)) { + $sql = 'SELECT hrt.*, hbl.`hotel_name`, + COALESCE(hrtstl.`name`, "'.$this->selling_object_name.'") AS `selling_object_name`, + COALESCE(hrtstl.`plural_name`, "'.$this->selling_object_plural_name.'") AS `selling_object_plural_name` + FROM `'._DB_PREFIX_.'htl_room_type` AS hrt + INNER JOIN `'._DB_PREFIX_.'htl_branch_info_lang` AS hbl + ON (hbl.`id` = hrt.`id_hotel` + AND hbl.`id_lang` = '.(int)$idLang.') + LEFT JOIN `'._DB_PREFIX_.'product` AS p + ON (p.`id_product` = hrt.`id_product`) + LEFT JOIN `'._DB_PREFIX_.'room_type_selling_object` AS hrtso + ON (hrtso.`id_room_type_selling_object` = hrt.`id_selling_object` + AND hrtso.`active` = 1) + LEFT JOIN `'._DB_PREFIX_.'room_type_selling_object_lang` AS hrtstl + ON (hrtstl.`id_room_type_selling_object` = hrtso.`id_room_type_selling_object` + AND hrtstl.`id_lang` = '.(int)$idLang.') + WHERE hrt.`id_product` = '.(int)$id_product; - $sql = 'SELECT hrt.*, hbl.`hotel_name`, - hrtstl.`name` AS `room_type_selling_object`, - hrtstl.`plural_name` AS `multiple_room_type_selling_object` - FROM `'._DB_PREFIX_.'htl_room_type` AS hrt - INNER JOIN `'._DB_PREFIX_.'htl_branch_info_lang` AS hbl - ON (hbl.`id` = hrt.`id_hotel` - AND hbl.`id_lang` = '.(int)$idLang.') - LEFT JOIN `'._DB_PREFIX_.'product` AS p - ON (p.`id_product` = hrt.`id_product`) - LEFT JOIN `'._DB_PREFIX_.'room_type_selling_object` AS hrtso - ON (hrtso.`id_room_type_selling_object` = p.`id_room_type_selling_object` - AND hrtso.`active` = 1) - LEFT JOIN `'._DB_PREFIX_.'room_type_selling_object_lang` AS hrtstl - ON (hrtstl.`id_room_type_selling_object` = hrtso.`id_room_type_selling_object` - AND hrtstl.`id_lang` = '.(int)$idLang.') - WHERE hrt.`id_product` = '.(int)$id_product; + $result = Db::getInstance()->getRow($sql); - $result = Db::getInstance()->getRow($sql); - - if ($result && !$result['room_type_selling_object']) { - $module = Module::getInstanceByName('hotelreservationsystem'); - $result['room_type_selling_object'] = $module->l('Room', 'HotelRoomType'); - $result['multiple_room_type_selling_object'] = $module->l('Rooms', 'HotelRoomType'); + Cache::store($cache_key, $result); + } else { + $result = Cache::retrieve($cache_key); } - return $result; } @@ -318,41 +330,39 @@ class HotelRoomType extends ObjectModel $idLang = Context::getContext()->language->id; } - $sql = 'SELECT pl.`name`, COUNT(hri.`id`) AS `numberOfRooms`, hrt.`id_product`, `adults`, `children`, `max_adults`, `max_children`, `max_guests`, hrtstl.`name` AS `room_type_selling_object`, hrtstl.`plural_name` AS `multiple_room_type_selling_object` - '.($position ? ', cp.`position`' : '').' - '.($fullDetail ? ', pl.`link_rewrite`, pl.`description_short`' : '').' - FROM `'._DB_PREFIX_.'htl_room_type` AS `hrt` - INNER JOIN `'._DB_PREFIX_.'htl_room_information` AS `hri` ON (hri.`id_product` = hrt.`id_product`)'; - $sql .= ' INNER JOIN `'._DB_PREFIX_.'product_lang` pl ON (hrt.`id_product` = pl.`id_product` AND pl.`id_lang` = '.(int)$idLang.')'; - $sql .= ' LEFT JOIN `'._DB_PREFIX_.'product` AS p ON (p.`id_product` = hrt.`id_product`) - LEFT JOIN `'._DB_PREFIX_.'room_type_selling_object` AS hrtso - ON (hrtso.`id_room_type_selling_object` = p.`id_room_type_selling_object` - AND hrtso.`active` = 1) - LEFT JOIN `'._DB_PREFIX_.'room_type_selling_object_lang` AS hrtstl - ON (hrtstl.`id_room_type_selling_object` = hrtso.`id_room_type_selling_object` - AND hrtstl.`id_lang` = '.(int)$idLang.')'; + $cache_key = 'HotelRoomType::getRoomTypeDetailByRoomTypeIds_'.$roomTypesList.'_'.$position.'_'.$fullDetail.'_'.$idLang; + if (!Cache::isStored($cache_key)) { - if ($position) { - $sql .= ' INNER JOIN `'._DB_PREFIX_.'htl_branch_info` hbi ON (hbi.`id` = hrt.`id_hotel`) - INNER JOIN `'._DB_PREFIX_.'category_product` cp ON cp.`id_category` = hbi.`id_category` AND cp.`id_product` = hrt.`id_product`'; - } + $sql = 'SELECT pl.`name`, COUNT(hri.`id`) AS `numberOfRooms`, hrt.`id_product`, `adults`, `children`, `max_adults`, `max_children`, `max_guests`, COALESCE(hrtstl.`name`, "'.$this->selling_object_name.'") AS `selling_object_name`, COALESCE(hrtstl.`plural_name`, "'.$this->selling_object_plural_name.'") AS `selling_object_plural_name` + '.($position ? ', cp.`position`' : '').' + '.($fullDetail ? ', pl.`link_rewrite`, pl.`description_short`' : '').' + FROM `'._DB_PREFIX_.'htl_room_type` AS `hrt` + INNER JOIN `'._DB_PREFIX_.'htl_room_information` AS `hri` ON (hri.`id_product` = hrt.`id_product`)'; + $sql .= ' INNER JOIN `'._DB_PREFIX_.'product_lang` pl ON (hrt.`id_product` = pl.`id_product` AND pl.`id_lang` = '.(int)$idLang.')'; + $sql .= ' LEFT JOIN `'._DB_PREFIX_.'product` AS p ON (p.`id_product` = hrt.`id_product`) + LEFT JOIN `'._DB_PREFIX_.'room_type_selling_object` AS hrtso + ON (hrtso.`id_room_type_selling_object` = p.`id_selling_object` + AND hrtso.`active` = 1) + LEFT JOIN `'._DB_PREFIX_.'room_type_selling_object_lang` AS hrtstl + ON (hrtstl.`id_room_type_selling_object` = hrtso.`id_room_type_selling_object` + AND hrtstl.`id_lang` = '.(int)$idLang.')'; - $sql .= 'WHERE hrt.`id_product` IN ('.$roomTypesList.') - GROUP BY hrt.`id_product`'. - ($position ? ' ORDER BY cp.`position`' : ''); - - $results = Db::getInstance()->executeS($sql); - - foreach ($results as &$row) { - if (!$row['room_type_selling_object']) { - $module = Module::getInstanceByName('hotelreservationsystem'); - $row['room_type_selling_object'] = $module->l('Room', 'HotelRoomType'); - $row['multiple_room_type_selling_object'] = $module->l('Rooms', 'HotelRoomType'); + if ($position) { + $sql .= ' INNER JOIN `'._DB_PREFIX_.'htl_branch_info` hbi ON (hbi.`id` = hrt.`id_hotel`) + INNER JOIN `'._DB_PREFIX_.'category_product` cp ON cp.`id_category` = hbi.`id_category` AND cp.`id_product` = hrt.`id_product`'; } - } - unset($row); - return $results; + $sql .= 'WHERE hrt.`id_product` IN ('.$roomTypesList.') + GROUP BY hrt.`id_product`'. + ($position ? ' ORDER BY cp.`position`' : ''); + + $result = Db::getInstance()->executeS($sql); + Cache::store($cache_key, $result); + + } else { + $result = Cache::retrieve($cache_key); + } + return $result; } /** diff --git a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php index a741ca00b..77e58e5ac 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php @@ -304,7 +304,7 @@ class AdminOrderRefundRequestsController extends ModuleAdminController $objCustomer = new Customer($objOrderReturn->id_customer); $objOrder = new Order($objOrderReturn->id_order); $orderCurrency = new Currency($objOrder->id_currency); - $objRoomType = new HotelRoomType(); + $objRefundRules = new HotelOrderRefundRules(); if ($refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($objOrderReturn->id_order, $objOrderReturn->id)){ foreach ($refundReqBookings as &$booking) { @@ -316,9 +316,8 @@ class AdminOrderRefundRequestsController extends ModuleAdminController $booking = array_merge($booking, array_shift($bookingCharges)); - if (!empty($booking['room_type_selling_object_name'])) { - $sellingObjectNames = explode('|', $booking['room_type_selling_object_name']); - $booking['room_type_selling_object_name'] = $sellingObjectNames[0]; + if (!empty($booking['selling_object_name'])) { + $booking['selling_object_name'] = $booking['selling_object_name']; } } } diff --git a/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-rooms.tpl b/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-rooms.tpl index d980b664e..2ddd1a5fa 100644 --- a/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-rooms.tpl +++ b/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-rooms.tpl @@ -16,10 +16,10 @@
    @@ -27,7 +27,7 @@ - + @@ -64,13 +64,13 @@ -
    +
    -
    +
    @@ -119,7 +119,7 @@
    - + {if $occupancy_required_for_booking} @@ -157,7 +157,7 @@ -
    +
    @@ -212,7 +212,7 @@
    {l s='%s No.' sprintf=$book_v['room_type_selling_object'] mod='hotelreservationsystem'}{l s='%s No.' sprintf=$book_v['selling_object_name'] mod='hotelreservationsystem'} {l s='Duration' mod='hotelreservationsystem'} {l s='Message' mod='hotelreservationsystem'} {l s='Allotment Type' mod='hotelreservationsystem'}
    {l s='Duration' mod='hotelreservationsystem'}{l s='%s No.' sprintf=$book_v['room_type_selling_object'] mod='hotelreservationsystem'}{l s='%s No.' sprintf=$book_v['selling_object_name'] mod='hotelreservationsystem'} {l s='Allotment Type' mod='hotelreservationsystem'}{l s='Guests' mod='hotelreservationsystem'}
    - + @@ -259,7 +259,7 @@
    {l s='%s No.' sprintf=$book_v['room_type_selling_object'] mod='hotelreservationsystem'}{l s='%s No.' sprintf=$book_v['selling_object_name'] mod='hotelreservationsystem'} {l s='Duration' mod='hotelreservationsystem'} {l s='Order' mod='hotelreservationsystem'} {l s='Message' mod='hotelreservationsystem'}
    - + diff --git a/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl b/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl index 5ec142086..5b797c9c4 100644 --- a/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl +++ b/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl @@ -176,7 +176,7 @@
    {l s='%s No.' sprintf=$book_v['room_type_selling_object'] mod='hotelreservationsystem'}{l s='%s No.' sprintf=$book_v['selling_object_name'] mod='hotelreservationsystem'} {l s='Status' mod='hotelreservationsystem'} {l s='Duration' mod='hotelreservationsystem'} {l s='Message' mod='hotelreservationsystem'}