diff --git a/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl b/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl index e3405fa99..9566bbfe1 100644 --- a/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl +++ b/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl @@ -37,9 +37,7 @@ {l s='Room Image'} {l s='Room Type'} {l s='Duration'} - {if $occupancy_required_for_booking} - {l s='Occupancy'} - {/if} + {l s='Occupancy / Quantity'} {l s='Unit Price (tax excl)'} {l s='Extra Services / Fees (tax excl)'} {* {l s='Total Rooms Price (tax excl)'} *} @@ -58,7 +56,11 @@ {assign var="is_full_date" value=($show_full_date && ($data['date_from']|date_format:'%D' == $data['date_to']|date_format:'%D'))} {dateFormat date=$data.date_from full=$is_full_date} - {dateFormat date=$data.date_to full=$is_full_date} - {if $occupancy_required_for_booking} + {assign var=room_occ_required value=false} + {if isset($data.occupancy_required_for_booking)} + {assign var=room_occ_required value=$data.occupancy_required_for_booking} + {/if} + {if $room_occ_required}
+ {else} + + 1 + {/if} {assign var=shown_room_type_price value=$data.feature_price_tax_excl} diff --git a/admin/themes/default/template/controllers/products/configuration.tpl b/admin/themes/default/template/controllers/products/configuration.tpl index 7f0bc0f60..5e78cb1dc 100644 --- a/admin/themes/default/template/controllers/products/configuration.tpl +++ b/admin/themes/default/template/controllers/products/configuration.tpl @@ -21,9 +21,16 @@ *} {if isset($product->id)} + {if isset($htl_room_type['room_type_selling_type_name']) && $htl_room_type['room_type_selling_type_name']} + {assign var=attribute_type value=$htl_room_type['room_type_selling_type_name']} + {assign var=attribute_types value=$htl_room_type['room_type_selling_type_name']|cat:'s'} + {else} + {assign var=attribute_type value={l s='Room'}} + {assign var=attribute_types value={l s='Rooms'}} + {/if}
-

{l s='Rooms'}

+

{$attribute_types}

@@ -35,7 +42,7 @@ @@ -55,14 +62,14 @@ @@ -201,14 +208,14 @@
  • -  {l s='Create Rooms'} +  {l s='Create %s' sprintf=$attribute_types}
    • @@ -253,7 +260,7 @@
    @@ -325,7 +332,7 @@ -

      {l s='Bulk Update Rooms'}

    +

      {l s='Bulk Update %s' sprintf=$attribute_types}

    @@ -400,13 +407,13 @@ -

      {l s='Bulk Create Rooms'}

    +

      {l s='Bulk Create %s' sprintf=$attribute_types}

    @@ -414,7 +421,7 @@
    @@ -422,7 +429,7 @@
    @@ -558,13 +565,13 @@
  • - {l s='Make Room Available'} + {l s='Make %s Available' sprintf=$attribute_type}
  • - {l s='Disable Room'} + {l s='Disable %s' sprintf=$attribute_type}
    • @@ -1524,7 +1531,7 @@ $('#deactiveDatesModal').attr('data-room-row-index', roomRowIndex); $('#deactiveDatesModal').attr('data-id-room', idRoom); if ($.trim(roomNum) != '') { - roomNum = '( '+'{l s='Room No'}'+' '+roomNum+')'; + roomNum = '( '+'{l s='%s No' sprintf=$attribute_types}'+' '+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 cb97d2652..32098f146 100644 --- a/admin/themes/default/template/controllers/products/informations.tpl +++ b/admin/themes/default/template/controllers/products/informations.tpl @@ -125,16 +125,16 @@
    {if isset($htl_room_type)}
    -

    {l s='Hotel once assigned cannot be reassigned'}

    +

    {l s='Property once assigned cannot be reassigned'}

    {else}
    {if isset($htl_info) && $htl_info} @@ -143,9 +143,9 @@ {/foreach} -

    {l s='Hotel once assigned cannot be reassigned'}

    +

    {l s='Property once assigned cannot be reassigned'}

    {else} -
    {l s='No hotel are available'}
    +
    {l s='No property are available'}
    {/if}
    {/if} @@ -465,6 +465,35 @@
    {/if} +
    + +
    + +
    +
    + +
    + +
    + +
    +
    - {if isset($occupancy_required_for_booking) && $occupancy_required_for_booking}{l s='Room occupancy' mod='blockcart'}{else}{l s='Rooms quantity added' mod='blockcart'}{/if}  -  + + {if isset($occupancy_required_for_booking) && $occupancy_required_for_booking}{l s='Room occupancy' mod='blockcart'}{else}{l s='Rooms quantity added' mod='blockcart'}{/if}  -  + {l s='Quantity' mod='blockcart'}  - 
    - {l s='Room type cost' mod='blockcart'}  -  + {l s='Room type cost' mod='blockcart'}  -  {l s='Total' mod='blockcart'}  - 
    @@ -255,7 +257,7 @@ {block name='blockcart_layer_cart_room_total_price'}
    - {l s='Total Rooms Cost in cart' mod='blockcart'} + {l s='Total Stay Cost in cart' mod='blockcart'} {if $display_tax_label} {if $priceDisplay == 1} {l s='(tax excl.)' mod='blockcart'} diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php index fbf4ba1c6..96c05607f 100644 --- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php +++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php @@ -87,6 +87,7 @@ class HotelBookingDetail extends ObjectModel const SEARCH_TYPE_NORMAL = 2; // + const PS_ROOM_UNIT_SELECTION_TYPE_DEFAULT = 0; const PS_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY = 1; const PS_ROOM_UNIT_SELECTION_TYPE_QUANTITY = 2; diff --git a/modules/hotelreservationsystem/classes/HotelBranchInformation.php b/modules/hotelreservationsystem/classes/HotelBranchInformation.php index b4fb0ada8..ba300e3da 100644 --- a/modules/hotelreservationsystem/classes/HotelBranchInformation.php +++ b/modules/hotelreservationsystem/classes/HotelBranchInformation.php @@ -26,6 +26,7 @@ class HotelBranchInformation extends ObjectModel public $id_category; public $hotel_name; public $email; + public $id_property_type; public $check_in; public $check_out; public $description; @@ -51,6 +52,7 @@ class HotelBranchInformation extends ObjectModel 'fields' => array( 'id_category' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'), 'email' => array('type' => self::TYPE_STRING,'validate' => 'isEmail', 'size' => 255, 'required' => true), + 'id_property_type' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'), 'rating' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true), 'check_in' => array('type' => self::TYPE_STRING, 'required' => true), 'check_out' => array('type' => self::TYPE_STRING, 'required' => true), @@ -577,6 +579,36 @@ class HotelBranchInformation extends ObjectModel return Db::getInstance()->getRow($sql); } + public function getHotelPropertyTypeName($id_hotel = null, $idLang = null) + { + if (!$idLang) { + $idLang = Context::getContext()->language->id; + } + + if (!$id_hotel) { + $id_hotel = (int) $this->id; + } + + if (!$id_hotel) { + return false; + } + + $cache_key = 'HotelBranchInformation::getHotelPropertyTypeName'.(int)$id_hotel; + if(!Cache::isStored($cache_key)){ + $sql = 'SELECT hrtstl.`name` + FROM `'._DB_PREFIX_.'htl_branch_info` hbi + LEFT JOIN `'._DB_PREFIX_.'htl_room_type_selling_type_lang` hrtstl + ON (hbi.`id_property_type` = hrtstl.`id_htl_room_type_selling_type` + AND hrtstl.`id_lang` = '.(int) $idLang.') + WHERE hbi.`id` = '.(int) $id_hotel; + + $res = Db::getInstance()->getValue($sql); + }else{ + $res = Cache::retrieve($cache_key); + } + return $res; + } + /** * [getHotelCategoryTree : Select category info by name of the category] * @param [string] $searchData [description] diff --git a/modules/hotelreservationsystem/classes/HotelCartBookingData.php b/modules/hotelreservationsystem/classes/HotelCartBookingData.php index be3cabc94..3d896d0cf 100644 --- a/modules/hotelreservationsystem/classes/HotelCartBookingData.php +++ b/modules/hotelreservationsystem/classes/HotelCartBookingData.php @@ -459,11 +459,7 @@ class HotelCartBookingData extends ObjectModel $chkQty = 0; $num_days = HotelHelper::getNumberOfDays($date_from, $date_to); $objServiceProductCartDetail = new ServiceProductCartDetail(); - if (defined('_PS_ADMIN_DIR_')) { - $PS_ROOM_UNIT_SELECTION_TYPE = Configuration::get('PS_BACKOFFICE_ROOM_BOOKING_TYPE'); - } else { - $PS_ROOM_UNIT_SELECTION_TYPE = Configuration::get('PS_FRONT_ROOM_UNIT_SELECTION_TYPE'); - } + $PS_ROOM_UNIT_SELECTION_TYPE = Product::getRoomTypeBookingMethod($id_product); if ($PS_ROOM_UNIT_SELECTION_TYPE == HotelBookingDetail::PS_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY) { $roomsRequired = count($occupancy); } else { @@ -594,11 +590,7 @@ class HotelCartBookingData extends ObjectModel 'id_cart' => $id_cart, 'id_guest' => $id_guest, ); - if (defined('_PS_ADMIN_DIR_')) { - $PS_ROOM_UNIT_SELECTION_TYPE = Configuration::get('PS_BACKOFFICE_ROOM_BOOKING_TYPE'); - } else { - $PS_ROOM_UNIT_SELECTION_TYPE = Configuration::get('PS_FRONT_ROOM_UNIT_SELECTION_TYPE'); - } + $PS_ROOM_UNIT_SELECTION_TYPE = Product::getRoomTypeBookingMethod($id_product); if ($PS_ROOM_UNIT_SELECTION_TYPE == HotelBookingDetail::PS_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY) { $roomsRequired = count($occupancy); } else { @@ -1178,6 +1170,8 @@ class HotelCartBookingData extends ObjectModel $cart_detail_data[$key]['room_num'] = $obj_htl_room_info->room_num; $cart_detail_data[$key]['date_from'] = $value['date_from']; $cart_detail_data[$key]['date_to'] = $value['date_to']; + $cart_detail_data[$key]['occupancy_required_for_booking'] = + (Product::getRoomTypeBookingMethod($value['id_product']) == HotelBookingDetail::PS_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY); $cart_detail_data[$key]['child_ages'] = json_decode($value['child_ages']); $occupancy = array( @@ -1563,6 +1557,7 @@ 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_type_name'] = $roomDetail['room_type_selling_type_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 a196694f5..6bdded18c 100644 --- a/modules/hotelreservationsystem/classes/HotelHelper.php +++ b/modules/hotelreservationsystem/classes/HotelHelper.php @@ -1368,6 +1368,45 @@ class HotelHelper return true; } + public function createHotelDefaultRoomTypeSellingTypes() + { + $propertyTypes = array( + 'Hotel', + 'Motel', + ); + + $sellingTypes = array( + 'Room', + 'Apartment', + 'Villa', + 'Cottage', + 'Bungalow', + ); + + $languages = Language::getLanguages(true); + foreach ($propertyTypes as $typeName) { + $objType = new HotelRoomTypeSellingType(); + $objType->type = HotelRoomTypeSellingType::HOTEL_PROPERTY_TYPE; + $objType->active = 1; + foreach ($languages as $lang) { + $objType->name[$lang['id_lang']] = $typeName; + } + $objType->save(); + } + + foreach ($sellingTypes as $typeName) { + $objType = new HotelRoomTypeSellingType(); + $objType->type = HotelRoomTypeSellingType::ROOM_TYPE_OBJECT_SELLING_TYPE; + $objType->active = 1; + foreach ($languages as $lang) { + $objType->name[$lang['id_lang']] = $typeName; + } + $objType->save(); + } + + return true; + } + public static function getPsProducts($id_lang, $start = 0, $limit = 0, $booking_product = null) { $sql = 'SELECT p.`id_product`, pl.`name`, p.`booking_product` @@ -1386,6 +1425,7 @@ class HotelHelper { $obj_hotel_info = new HotelBranchInformation(); $obj_hotel_info->active = 1; + $obj_hotel_info->id_property_type = 1; $obj_hotel_info->email = 'hotelprime@htl.com'; $obj_hotel_info->check_in = '12:00'; $obj_hotel_info->check_out = '11:00'; @@ -1989,6 +2029,7 @@ class HotelHelper $product->show_at_front = 1; $product->is_virtual = 1; $product->indexed = 1; + $product->id_room_type_selling_object_type = 3; // assign default selling type as 'Per Room' $product->save(); $product_id = $product->id; diff --git a/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php b/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php index ca44a2826..06e9ee61d 100644 --- a/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php +++ b/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php @@ -59,6 +59,7 @@ class HotelReservationSystemDb `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `id_category` int(10) unsigned NOT NULL, `email` varchar(128) NOT NULL, + `id_property_type` int(10) unsigned NOT NULL DEFAULT '0', `check_in` varchar(255) DEFAULT NULL, `check_out` varchar(255) DEFAULT NULL, `rating` int(2) unsigned NOT NULL, @@ -117,6 +118,22 @@ class HotelReservationSystemDb PRIMARY KEY (`id`, `id_lang`) ) ENGINE="._MYSQL_ENGINE_." DEFAULT CHARSET=utf8;", + "CREATE TABLE IF NOT EXISTS `"._DB_PREFIX_."htl_room_type_selling_type` ( + `id_htl_room_type_selling_type` int(10) unsigned NOT NULL AUTO_INCREMENT, + `type` tinyint(2) unsigned NOT NULL, + `active` tinyint(1) unsigned NOT NULL DEFAULT '1', + `date_add` datetime NOT NULL, + `date_upd` datetime NOT NULL, + PRIMARY KEY (`id_htl_room_type_selling_type`) + ) ENGINE="._MYSQL_ENGINE_." DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;", + + "CREATE TABLE IF NOT EXISTS `"._DB_PREFIX_."htl_room_type_selling_type_lang` ( + `id_htl_room_type_selling_type` int(10) unsigned NOT NULL, + `id_lang` int(10) unsigned NOT NULL, + `name` varchar(255) NOT NULL, + PRIMARY KEY (`id_htl_room_type_selling_type`, `id_lang`) + ) ENGINE="._MYSQL_ENGINE_." DEFAULT CHARSET=utf8;", + "CREATE TABLE IF NOT EXISTS `"._DB_PREFIX_."htl_cart_booking_data` ( `id` int(11) NOT NULL AUTO_INCREMENT, `id_cart` int(11) NOT NULL, @@ -613,6 +630,8 @@ class HotelReservationSystemDb `'._DB_PREFIX_.'htl_bed_type`, `'._DB_PREFIX_.'htl_bed_type_lang`, `'._DB_PREFIX_.'htl_room_type_bed_type`, + `'._DB_PREFIX_.'htl_room_type_selling_type`, + `'._DB_PREFIX_.'htl_room_type_selling_type_lang`, `'._DB_PREFIX_.'htl_access`, `'._DB_PREFIX_.'htl_settings_link`, `'._DB_PREFIX_.'htl_settings_link_lang`' diff --git a/modules/hotelreservationsystem/classes/HotelRoomType.php b/modules/hotelreservationsystem/classes/HotelRoomType.php index 849b00a8d..3f345bc03 100644 --- a/modules/hotelreservationsystem/classes/HotelRoomType.php +++ b/modules/hotelreservationsystem/classes/HotelRoomType.php @@ -234,10 +234,15 @@ class HotelRoomType extends ObjectModel if (!$idLang) { $idLang = Context::getContext()->language->id; } - $sql = 'SELECT hrt.*, hbl.`hotel_name` + $sql = 'SELECT hrt.*, hbl.`hotel_name`, hrtstl.`name` AS `room_type_selling_type_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_.'htl_room_type_selling_type_lang` AS hrtstl + ON (hrtstl.`id_htl_room_type_selling_type` = p.`id_room_type_selling_object_type` + AND hrtstl.`id_lang` = '.(int)$idLang.') WHERE hrt.`id_product` = '.(int)$id_product; return Db::getInstance()->getRow($sql); @@ -298,12 +303,16 @@ 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` + $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_type_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_.'htl_room_type_selling_type_lang` AS hrtstl + ON (hrtstl.`id_htl_room_type_selling_type` = p.`id_room_type_selling_object_type` + AND hrtstl.`id_lang` = '.(int)$idLang.')'; if ($position) { $sql .= ' INNER JOIN `'._DB_PREFIX_.'htl_branch_info` hbi ON (hbi.`id` = hrt.`id_hotel`) diff --git a/modules/hotelreservationsystem/classes/HotelRoomTypeSellingType.php b/modules/hotelreservationsystem/classes/HotelRoomTypeSellingType.php new file mode 100644 index 000000000..28ecf8503 --- /dev/null +++ b/modules/hotelreservationsystem/classes/HotelRoomTypeSellingType.php @@ -0,0 +1,102 @@ + 'htl_room_type_selling_type', + 'primary' => 'id_htl_room_type_selling_type', + 'multilang' => true, + 'fields' => array( + 'type' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt', 'required' => true), + 'active' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'), + 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate', 'copy_post' => false), + 'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate', 'copy_post' => false), + 'name' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true), + ), + ); + + public static function getRoomTypeSellingObjectTypes($idLang = null, $active = true) + { + if (!$idLang) { + $idLang = Context::getContext()->language->id; + } + + $cache_key = 'HotelRoomTypeSellingType::getRoomTypeSellingObjectTypes'.$idLang.'_'.$active; + if(!Cache::isStored($cache_key)){ + $sql = 'SELECT hrtst.`id_htl_room_type_selling_type` AS `id_room_type_selling_object_type`, hrtstl.`name` + FROM `'._DB_PREFIX_.'htl_room_type_selling_type` hrtst + LEFT JOIN `'._DB_PREFIX_.'htl_room_type_selling_type_lang` hrtstl + ON (hrtst.`id_htl_room_type_selling_type` = hrtstl.`id_htl_room_type_selling_type` + AND hrtstl.`id_lang` = '.(int) $idLang.') + WHERE hrtst.`type` = '.(int) self::ROOM_TYPE_OBJECT_SELLING_TYPE. + ($active ? ' AND hrtst.`active` = 1' : '').' + ORDER BY hrtstl.`name` ASC'; + + $res = Db::getInstance()->executeS($sql); + }else { + $res = Cache::retrieve($cache_key); + } + + return $res; + + } + + public static function getHotelPropertyTypes($idLang = null, $active = true) + { + if (!$idLang) { + $idLang = Context::getContext()->language->id; + } + + $cache_key = 'HotelRoomTypeSellingType::getHotelPropertyTypes'.$idLang.'_'.$active; + if(!Cache::isStored($cache_key)){ + + $sql = 'SELECT hrtst.`id_htl_room_type_selling_type` AS `id_property_type`, hrtstl.`name` + FROM `'._DB_PREFIX_.'htl_room_type_selling_type` hrtst + LEFT JOIN `'._DB_PREFIX_.'htl_room_type_selling_type_lang` hrtstl + ON (hrtst.`id_htl_room_type_selling_type` = hrtstl.`id_htl_room_type_selling_type` + AND hrtstl.`id_lang` = '.(int) $idLang.') + WHERE hrtst.`type` = '.(int) self::HOTEL_PROPERTY_TYPE. + ($active ? ' AND hrtst.`active` = 1' : '').' + ORDER BY hrtstl.`name` ASC'; + + $res = Db::getInstance()->executeS($sql); + + }else{ + $res = Cache::retrieve($cache_key); + } + + return $res; + + } + +} diff --git a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php index a2b513676..1a3ddceec 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php @@ -222,6 +222,13 @@ class AdminAddHotelController extends ModuleAdminController $smartyVars['PS_MAX_CHECKOUT_OFFSET'] = (int) Configuration::get('PS_MAX_CHECKOUT_OFFSET'); $smartyVars['PS_MIN_BOOKING_OFFSET'] = (int) Configuration::get('PS_MIN_BOOKING_OFFSET'); $smartyVars['WK_ORDER_REFUND_ALLOWED'] = Configuration::get('WK_ORDER_REFUND_ALLOWED'); + $hotelPropertyTypes = HotelRoomTypeSellingType::getHotelPropertyTypes($this->context->language->id); + $smartyVars['hotel_property_types_info'] = $hotelPropertyTypes; + $selectedHotelPropertyType = Tools::getValue('id_property_type'); + if (!$selectedHotelPropertyType && isset($hotelBranchInfo)) { + $selectedHotelPropertyType = $hotelBranchInfo->id_property_type; + } + $smartyVars['selected_hotel_property_type'] = (int) $selectedHotelPropertyType; $this->context->smarty->assign($smartyVars); @@ -259,6 +266,7 @@ class AdminAddHotelController extends ModuleAdminController $active = Tools::getValue('ENABLE_HOTEL'); $fax = Tools::getValue('fax'); $activeRefund = Tools::getValue('active_refund'); + $idHotelPropertyType = Tools::getValue('id_property_type'); $enableUseGlobalMaxCheckoutOffset = Tools::getValue('enable_use_global_max_checkout_offset'); $maxCheckoutOffset = trim(Tools::getValue('max_checkout_offset')); $enableUseGlobalMinBookingOffset = Tools::getValue('enable_use_global_min_booking_offset'); @@ -288,6 +296,10 @@ class AdminAddHotelController extends ModuleAdminController } } + if ($idHotelPropertyType == '' && $idHotelPropertyType == null && !Validate::isUnsignedId($idHotelPropertyType)) { + $this->errors[] = $this->l('Invalid property type.'); + } + foreach ($languages as $lang) { if ($shortDescription = html_entity_decode(Tools::getValue('short_description_'.$lang['id_lang']))) { if (!Validate::isCleanHtml($shortDescription)) { @@ -503,6 +515,7 @@ class AdminAddHotelController extends ModuleAdminController $objHotelBranch->active = $active; $objHotelBranch->active_refund = $activeRefund; $objHotelBranch->fax = $fax; + $objHotelBranch->id_property_type = $idHotelPropertyType; // lang fields $hotelCatName = array(); diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomTypeSellingTypesController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomTypeSellingTypesController.php new file mode 100644 index 000000000..0ea48a0fc --- /dev/null +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomTypeSellingTypesController.php @@ -0,0 +1,168 @@ +bootstrap = true; + $this->table = 'htl_room_type_selling_type'; + $this->className = 'HotelRoomTypeSellingType'; + $this->identifier = 'id_htl_room_type_selling_type'; + $this->lang = true; + $this->context = Context::getContext(); + $this->toolbar_title = $this->l('Property & Room Types'); + + parent::__construct(); + + $this->propertyTypes = array( + HotelRoomTypeSellingType::HOTEL_PROPERTY_TYPE => $this->l('Property type'), + HotelRoomTypeSellingType::ROOM_TYPE_OBJECT_SELLING_TYPE => $this->l('Room selling type'), + ); + + $this->fields_list = array( + 'id_htl_room_type_selling_type' => array( + 'title' => $this->l('ID'), + 'align' => 'center', + 'class' => 'fixed-width-xs', + ), + 'name' => array( + 'title' => $this->l('Name'), + 'align' => 'left', + ), + 'type' => array( + 'title' => $this->l('Type'), + 'align' => 'center', + 'type' => 'select', + 'list' => $this->propertyTypes, + 'filter_key' => 'a!type', + 'callback' => 'getSellingTypeLabel', + ), + 'active' => array( + 'title' => $this->l('Status'), + 'align' => 'center', + 'active' => 'status', + 'type' => 'bool', + 'orderby' => false, + ), + ); + + $this->addRowAction('edit'); + $this->addRowAction('delete'); + $this->bulk_actions = array( + 'delete' => array( + 'text' => $this->l('Delete selected'), + 'confirm' => $this->l('Delete selected items?'), + 'icon' => 'icon-trash' + ) + ); + } + + public function initPageHeaderToolbar() + { + if (!$this->display || $this->display == 'list') { + $this->page_header_toolbar_btn['new_type'] = array( + 'href' => self::$currentIndex.'&add'.$this->table.'&token='.$this->token, + 'desc' => $this->l('Add new', null, null, false), + 'icon' => 'process-icon-new' + ); + } + + parent::initPageHeaderToolbar(); + } + + public function initToolbar() + { + $this->toolbar_btn = array(); + } + + public function renderForm() + { + if (!$this->loadObject(true)) { + return; + } + + $typeSelect = array(); + foreach ($this->propertyTypes as $id => $name) { + $typeSelect[] = array('id' => $id, 'name' => $name); + } + + $this->fields_form = array( + 'legend' => array( + 'title' => $this->l('Type'), + 'icon' => 'icon-tags', + ), + 'input' => array( + array( + 'type' => 'text', + 'label' => $this->l('Name'), + 'name' => 'name', + 'lang' => true, + 'required' => true, + 'hint' => $this->l('Displayed name for this type.'), + ), + array( + 'type' => 'select', + 'label' => $this->l('Type'), + 'name' => 'type', + 'required' => true, + 'options' => array( + 'query' => $typeSelect, + 'id' => 'id', + 'name' => 'name', + ), + ), + array( + 'type' => 'switch', + 'label' => $this->l('Status'), + 'name' => 'active', + 'is_bool' => true, + 'values' => array( + array( + 'id' => 'active_on', + 'value' => 1, + 'label' => $this->l('Enabled'), + ), + array( + 'id' => 'active_off', + 'value' => 0, + 'label' => $this->l('Disabled'), + ) + ), + ), + ), + 'submit' => array( + 'title' => $this->l('Save'), + ) + ); + + return parent::renderForm(); + } + + public function getSellingTypeLabel($value, $row) + { + return isset($this->propertyTypes[$value]) ? $this->propertyTypes[$value] : $value; + } + +} diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php index fac60d468..fd1b887da 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php @@ -368,11 +368,16 @@ class AdminHotelRoomsBookingController extends ModuleAdminController ); $allotmentTypes = HotelBookingDetail::getAllAllotmentTypes(); - $occupancyRequiredForBooking = false; - if (Configuration::get('PS_BACKOFFICE_ROOM_BOOKING_TYPE') == HotelBookingDetail::PS_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY) { - $occupancyRequiredForBooking = true; - } + foreach ($booking_data['rm_data'] as $roomKey => $roomData) { + if (!isset($roomData['id_product'])) { + continue; + } + + $booking_data['rm_data'][$roomKey]['occupancy_required_for_booking'] = + (int) (Product::getRoomTypeBookingMethod($roomData['id_product']) == HotelBookingDetail::PS_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY); + } + $this->context->smarty->assign(array( 'adults' => $adults, 'children' => $children, @@ -382,7 +387,6 @@ class AdminHotelRoomsBookingController extends ModuleAdminController 'occupancy' => $this->occupancy, 'date_from' => $this->date_from, 'date_to' => $this->date_to, - 'occupancy_required_for_booking' => $occupancyRequiredForBooking, 'max_child_age' => Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'), 'max_child_in_room' => Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM'), 'link' => $this->context->link, @@ -684,7 +688,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $date_from = Tools::getValue('date_from'); $date_to = Tools::getValue('date_to'); $occupancy = Tools::getValue('occupancy'); - if (Configuration::get('PS_BACKOFFICE_ROOM_BOOKING_TYPE') == HotelBookingDetail::PS_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY) { + if (Product::getRoomTypeBookingMethod($id_product) == HotelBookingDetail::PS_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY) { if (!Validate::isOccupancy($occupancy)) { $occupancy = array(); } @@ -959,10 +963,6 @@ class AdminHotelRoomsBookingController extends ModuleAdminController { parent::setMedia(); $currency = new Currency((int)Configuration::get('PS_CURRENCY_DEFAULT')); - $occupancyRequiredForBooking = false; - if (Configuration::get('PS_BACKOFFICE_ROOM_BOOKING_TYPE') == HotelBookingDetail::PS_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY) { - $occupancyRequiredForBooking = true; - } if ($this->context->employee->isSuperAdmin()) { $backOrderConfigKey = 'PS_BACKDATE_ORDER_SUPERADMIN'; } else { @@ -982,7 +982,6 @@ class AdminHotelRoomsBookingController extends ModuleAdminController 'SELLING_PREFERENCE_STANDALONE' => Product::SELLING_PREFERENCE_STANDALONE, 'max_child_age' => Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'), 'max_child_in_room' => Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM'), - 'occupancy_required_for_booking' => $occupancyRequiredForBooking, 'rooms_reallocation_url' => $this->context->link->getAdminLink('AdminHotelRoomsBooking'), 'rooms_booking_url' => $this->context->link->getAdminLink('AdminHotelRoomsBooking'), 'opt_select_all' => $this->l('All Types', null, true), diff --git a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php index 8edfba919..28268cf10 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php @@ -241,7 +241,7 @@ class AdminOrderRefundRequestsController extends ModuleAdminController 'callback' => 'getUniqueRoomTypeNames' ), 'hotel_name' => array( - 'title' => $this->l('Hotel') + 'title' => $this->l('Property Name') ), 'date_from' => array( 'title' => $this->l('Date From') diff --git a/modules/hotelreservationsystem/define.php b/modules/hotelreservationsystem/define.php index e8a7cc909..aa436407f 100644 --- a/modules/hotelreservationsystem/define.php +++ b/modules/hotelreservationsystem/define.php @@ -49,6 +49,7 @@ require_once 'classes/HotelRoomDisableDates.php'; require_once 'classes/HotelBranchRefundRules.php'; require_once 'classes/HotelBedType.php'; require_once 'classes/HotelRoomTypeBedType.php'; +require_once 'classes/HotelRoomTypeSellingType.php'; // linked products require_once 'classes/RoomTypeServiceProduct.php'; diff --git a/modules/hotelreservationsystem/hotelreservationsystem.php b/modules/hotelreservationsystem/hotelreservationsystem.php index baa85790c..c361346b1 100644 --- a/modules/hotelreservationsystem/hotelreservationsystem.php +++ b/modules/hotelreservationsystem/hotelreservationsystem.php @@ -555,6 +555,7 @@ class HotelReservationSystem extends Module $this->installTab('AdminAddHotel', 'Manage Hotel', 'AdminHotelReservationSystemManagement'); $this->installTab('AdminHotelRoomsBooking', 'Book Now', 'AdminHotelReservationSystemManagement'); $this->installTab('AdminHotelFeatures', 'Manage Hotel Features', 'AdminHotelReservationSystemManagement'); + $this->installTab('AdminHotelRoomTypeSellingTypes', 'Property & Room Types', 'AdminHotelReservationSystemManagement'); $this->installTab('AdminOrderRefundRules', 'Manage Order Refund Rules', 'AdminHotelReservationSystemManagement'); $this->installTab('AdminOrderRefundRequests', 'Manage Order Refund Requests', 'AdminHotelReservationSystemManagement'); @@ -610,6 +611,7 @@ class HotelReservationSystem extends Module || !$objHtlHelper->insertDefaultHotelEntries() || !$objHtlHelper->createHotelRoomDefaultFeatures() || !$objHtlHelper->createHotelDefaultBedTypes() + || !$objHtlHelper->createHotelDefaultRoomTypeSellingTypes() || !$objHtlHelper->insertHotelCommonFeatures() ) { return false; diff --git a/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js b/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js index 225f08bd2..71325392c 100644 --- a/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js +++ b/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js @@ -296,15 +296,23 @@ $(document).ready(function() { function getBookingOccupancyDetails(bookingform) { - let occupancy; - if (occupancy_required_for_booking) { + if (!bookingform || !bookingform.length) { + return 1; + } + + var isOccupancy = $(bookingform).data('occupancy-required'); + if (typeof isOccupancy === 'undefined') { + isOccupancy = (typeof occupancy_required_for_booking !== 'undefined') ? occupancy_required_for_booking : false; + } + var occupancy; + if (isOccupancy) { $('.booking_occupancy_wrapper').parent().removeClass('open'); - let selected_occupancy = $(bookingform).find(".occupancy_info_block.selected") + var selected_occupancy = $(bookingform).find(".occupancy_info_block.selected"); if (selected_occupancy.length) { occupancy = []; $(selected_occupancy).each(function(ind, element) { if (parseInt($(element).find('.num_adults').val())) { - let child_ages = []; + var child_ages = []; $(element).find('.guest_child_age').each(function(index) { if ($(this).val() > -1) { child_ages.push($(this).val()); @@ -796,7 +804,8 @@ $(document).ready(function() { var adults = 0; var children = 0; var rooms = $(booking_occupancy_wrapper).find('.occupancy_info_block').length; - + var roomLabel = $(booking_occupancy_wrapper).data('attribute_type') || room_txt; + var roomsLabel = $(booking_occupancy_wrapper).data('attribute_types') || rooms_txt; $(booking_occupancy_wrapper).find(".num_adults" ).each(function(key, val) { adults += parseInt($(this).val()); }); @@ -818,9 +827,9 @@ $(document).ready(function() { } } if (parseInt(rooms) > 1) { - guestButtonVal += ', ' + parseInt(rooms) + ' ' + rooms_txt; + guestButtonVal += ', ' + parseInt(rooms) + ' ' + roomsLabel; } else { - guestButtonVal += ', ' + parseInt(rooms) + ' ' + room_txt; + guestButtonVal += ', ' + parseInt(rooms) + ' ' + roomLabel; } $(booking_occupancy_wrapper).siblings('.booking_guest_occupancy').find('span').text(guestButtonVal); } diff --git a/modules/hotelreservationsystem/views/templates/admin/add_hotel/helpers/form/form.tpl b/modules/hotelreservationsystem/views/templates/admin/add_hotel/helpers/form/form.tpl index 73972046a..2081956a3 100644 --- a/modules/hotelreservationsystem/views/templates/admin/add_hotel/helpers/form/form.tpl +++ b/modules/hotelreservationsystem/views/templates/admin/add_hotel/helpers/form/form.tpl @@ -23,9 +23,9 @@
    {if isset($edit)} - {l s='Edit Hotel' mod='hotelreservationsystem'} + {l s='Edit Property' mod='hotelreservationsystem'} {else} - {l s='Add New Hotel' mod='hotelreservationsystem'} + {l s='Add New Property' mod='hotelreservationsystem'} {/if}
    @@ -110,7 +110,7 @@
    @@ -123,9 +123,26 @@
    +
    + +
    + +
    +
    @@ -282,7 +299,7 @@
    @@ -417,7 +434,7 @@
    {* Image table *} -

    {l s='Hotel Images' mod='hotelreservationsystem'}

    +

    {l s='Property Images' mod='hotelreservationsystem'}

    {include file="../../_partials/htl-images-list.tpl"} @@ -425,7 +442,7 @@
    {else}
    - {l s='Please save hotel information before saving hotel images.' mod='hotelreservationsystem'} + {l s='Please save property information before saving property images.' mod='hotelreservationsystem'}
    {/if} @@ -482,7 +499,7 @@
    {else}
    - {l s='Please save the hotel information before saving the hotel booking restrictions.' mod='hotelreservationsystem'} + {l s='Please save the property information before saving the property booking restrictions.' mod='hotelreservationsystem'}
    {/if} @@ -572,7 +589,7 @@
    {else}
    - {l s='Please save hotel information before saving refund policy options.' mod='hotelreservationsystem'} + {l s='Please save property information before saving refund policy options.' mod='hotelreservationsystem'}
    {/if} @@ -595,7 +612,7 @@
    {else}
    - {l s='Please save hotel information before assigning hotel features.' mod='hotelreservationsystem'} + {l s='Please save property information before assigning property features.' mod='hotelreservationsystem'}
    {/if} 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 7c68db350..1a90606e0 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,11 +27,11 @@ - + - {if $occupancy_required_for_booking} + {if $book_v.occupancy_required_for_booking} {/if} @@ -53,19 +53,19 @@ {/foreach} - {if $occupancy_required_for_booking} - {/if} {/foreach} @@ -114,9 +114,9 @@ - + - {if $occupancy_required_for_booking} + {if $book_v.occupancy_required_for_booking} {/if} @@ -142,13 +142,13 @@ {/foreach} - {if $occupancy_required_for_booking} - {/if} {/foreach} @@ -203,7 +203,7 @@
    {l s='Room No.' mod='hotelreservationsystem'}{l s='%s No.' sprintf=$book_v['room_type_selling_type_name'] mod='hotelreservationsystem'} {l s='Duration' mod='hotelreservationsystem'} {l s='Message' mod='hotelreservationsystem'} {l s='Allotment Type' mod='hotelreservationsystem'}{l s='Guests' mod='hotelreservationsystem'}{l s='Action' mod='hotelreservationsystem'} + {if $book_v.occupancy_required_for_booking} +
    -
    +
    -
    +
    @@ -100,7 +100,7 @@
    		- +
    {l s='Duration' mod='hotelreservationsystem'}{l s='Room No.' mod='hotelreservationsystem'}{l s='%s No.' sprintf=$book_v['room_type_selling_type_name'] mod='hotelreservationsystem'} {l s='Allotment Type' mod='hotelreservationsystem'}{l s='Guests' mod='hotelreservationsystem'}{l s='Action' mod='hotelreservationsystem'} + {if $book_v.occupancy_required_for_booking} +
    -
    +
    @@ -189,7 +189,7 @@
    		- +
    - + @@ -246,7 +246,7 @@
    {l s='Room No.' mod='hotelreservationsystem'}{l s='%s No.' sprintf=$book_v['room_type_selling_type_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 d8cadf9e9..6a2ee54fa 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 @@ -144,7 +144,7 @@ {/if} - + diff --git a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl index 233e2a1c4..26f90c9e8 100644 --- a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl +++ b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl @@ -28,7 +28,7 @@ {if isset($location_enabled) && $location_enabled}
    - +
      @@ -50,7 +50,7 @@
      - {foreach $hotels_info as $name_val} diff --git a/themes/hotel-reservation-theme/_partials/booking-form.tpl b/themes/hotel-reservation-theme/_partials/booking-form.tpl index 0647736f3..23dd74bc6 100644 --- a/themes/hotel-reservation-theme/_partials/booking-form.tpl +++ b/themes/hotel-reservation-theme/_partials/booking-form.tpl @@ -19,9 +19,15 @@ * @copyright Since 2010 Webkul * @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0 *} - +{if isset($room_type_info['room_type_selling_type_name']) && $room_type_info['room_type_selling_type_name']} + {assign var=attribute_types value=$room_type_info['room_type_selling_type_name']|cat:'s'} + {assign var=attribute_type value=$room_type_info['room_type_selling_type_name']} +{else} + {assign var=attribute_types value={l s='Rooms'}} + {assign var=attribute_type value={l s='Room'}} +{/if}
      -
      +
      {block name='booking_form_content'}
      {block name='product_hidden_fields'} @@ -36,7 +42,7 @@ {block name='booking_form_hotel_location'} {if isset($id_hotel) && $id_hotel}
      - +

      {$hotel_location|escape:'html':'UTF-8'}

      {/if} @@ -66,7 +72,7 @@ {include file="./occupancy_field.tpl"} {/block} {else} - + {block name='quantity_field'} {include file="./quantity_field.tpl"} {/block} @@ -79,7 +85,7 @@
      - +

      {convertPrice price=$rooms_price|floatval} + @@ -100,7 +106,7 @@

      {if isset($selected_service_product) && $selected_service_product}
      -

      {l s='Selected services'} {l s='(Per room)'}

      +

      {l s='Selected services'} {l s='(Per %s)' sprintf=$attribute_type}

      {foreach $selected_service_product as $product}
      @@ -143,7 +149,7 @@
      -
      {l s='Total price per room'}
      +
      {l s='Total price per %s' sprintf=$attribute_type}

      {displayPrice price=$demands_price_per_room}

      @@ -181,7 +187,7 @@ {$total_available_rooms|escape:'html':'UTF-8'} - {if $total_available_rooms > 1} {l s='rooms left!'} {else} {l s='room left!'} {/if} + {if $total_available_rooms > 1} {l s='%s left!' sprintf=$attribute_types} {else} {l s='%s left!' sprintf=$attribute_type} {/if}
      {/if} {/block} @@ -212,7 +218,7 @@ {/block} {else}
      - {l s='All rooms sold out!'} + {l s='All %s sold out!' sprintf=$attribute_types}
      {/if} {/if} @@ -220,7 +226,7 @@ {block name='booking_form_associated_hotels'} {if isset($associated_hotels) && $associated_hotels}
      - + @@ -46,7 +54,7 @@ {assign var=countRoom value=1} {foreach from=$occupancies key=key item=$occupancy name=occupancyInfo}
      -
      {l s='Room'} - {$countRoom|escape:'htmlall':'UTF-8'} {if !$smarty.foreach.occupancyInfo.first}{l s='Remove'}{/if}
      +
      {$attribute_type|escape:'htmlall':'UTF-8'} - {$countRoom|escape:'htmlall':'UTF-8'} {if !$smarty.foreach.occupancyInfo.first}{l s='Remove'}{/if}
      @@ -117,7 +125,7 @@ {/foreach} {else}
      -
      {l s='Room - 1'}
      +
      {$attribute_type|escape:'htmlall':'UTF-8'} - 1
      @@ -186,7 +194,7 @@ - {l s='Add Room'} + {l s='Add'} {$attribute_type|escape:'html':'UTF-8'} diff --git a/themes/hotel-reservation-theme/_partials/order-room-detail.tpl b/themes/hotel-reservation-theme/_partials/order-room-detail.tpl index aaf47aa0c..7d2952501 100644 --- a/themes/hotel-reservation-theme/_partials/order-room-detail.tpl +++ b/themes/hotel-reservation-theme/_partials/order-room-detail.tpl @@ -19,7 +19,13 @@ * @copyright Since 2010 Webkul * @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0 *} - +{if isset($data_v.room_type_selling_type_name) && $data_v.room_type_selling_type_name} + {assign var=attribute_type value=$data_v.room_type_selling_type_name} + {assign var=attribute_types value=$data_v.room_type_selling_type_name|cat:'s'} +{else} + {assign var=attribute_type value={l s='Room'}} + {assign var=attribute_types value={l s='Rooms'}} +{/if}
      {block name='order_room_detail_room_image'} @@ -42,20 +48,20 @@ {if $rm_v['count_cancelled'] > 0} {if $rm_v['count_cancelled'] > 1} - {$rm_v['count_cancelled']} {l s='Rooms Cancelled'} + {$rm_v['count_cancelled']} {l s='%s Cancelled' sprintf=$attribute_types|escape:'html':'UTF-8'} {else} - {$rm_v['count_cancelled']} {l s='Room Cancelled'} + {$rm_v['count_cancelled']} {l s='%s Cancelled' sprintf=$attribute_type|escape:'html':'UTF-8'} {/if} {/if} {if $rm_v['count_refunded'] > 0} - - {if $rm_v['count_refunded'] > 1} - {$rm_v['count_refunded']} {l s='Rooms Refunded'} - {else} - {$rm_v['count_refunded']} {l s='Room Refunded'} - {/if} - + + {if $rm_v['count_refunded'] > 1} + {$rm_v['count_refunded']} {l s='%s Refunded' sprintf=$attribute_types|escape:'html':'UTF-8'} + {else} + {$rm_v['count_refunded']} {l s='%s Refunded' sprintf=$attribute_type|escape:'html':'UTF-8'} + {/if} + {/if}
      {/if} @@ -82,7 +88,7 @@
      -
      {l s='Rooms'}
      +
      {if $rm_v.num_rm > 1}{$attribute_types|escape:'html':'UTF-8'}{else}{$attribute_type|escape:'html':'UTF-8'}{/if}
      {$rm_v.num_rm|string_format:'%02d'}
      @@ -132,7 +138,7 @@
      -

      {l s='Room(s) cost:'}

      +

      {l s='%s cost:' sprintf=$attribute_types|escape:'html':'UTF-8'}

      diff --git a/themes/hotel-reservation-theme/_partials/room_type_list.tpl b/themes/hotel-reservation-theme/_partials/room_type_list.tpl index aaa0f3ec0..33e58404d 100644 --- a/themes/hotel-reservation-theme/_partials/room_type_list.tpl +++ b/themes/hotel-reservation-theme/_partials/room_type_list.tpl @@ -101,8 +101,12 @@ {block name='room_type_list_room_booking_fields'} {if !isset($restricted_country_mode) && !$PS_CATALOG_MODE && !$order_date_restrict} {if (!isset($display_all_room_types) || !$display_all_room_types)} -

      - {if isset($occupancy_required_for_booking) && $occupancy_required_for_booking} + {assign var=room_occ_required value=false} + {if isset($room_v['occupancy_required_for_booking'])} + {assign var=room_occ_required value=$room_v['occupancy_required_for_booking']} + {/if} +
      + {if $room_occ_required}
      {block name='occupancy_field'} {include file="./occupancy_field.tpl" room_type_info=$room_v total_available_rooms=$room_v['room_left']} diff --git a/themes/hotel-reservation-theme/cart-total-block.tpl b/themes/hotel-reservation-theme/cart-total-block.tpl index 4b4e1b2fd..983cc69f8 100644 --- a/themes/hotel-reservation-theme/cart-total-block.tpl +++ b/themes/hotel-reservation-theme/cart-total-block.tpl @@ -25,7 +25,7 @@ {if $total_rooms_wt + $total_extra_demands_wt + $total_additional_services_wt + $total_additional_services_auto_add_wt}

      - {l s='Total rooms cost'} + {l s='Total Stay cost'} {if $display_tax_label} {if $use_taxes && $priceDisplay == 0} {l s='(tax incl)'} diff --git a/themes/hotel-reservation-theme/js/modules/blockcart/ajax-cart.js b/themes/hotel-reservation-theme/js/modules/blockcart/ajax-cart.js index ca2ad2695..955542f48 100644 --- a/themes/hotel-reservation-theme/js/modules/blockcart/ajax-cart.js +++ b/themes/hotel-reservation-theme/js/modules/blockcart/ajax-cart.js @@ -378,6 +378,9 @@ var ajaxCart = { if ($('.cart_block_list').hasClass('collapsed')) this.expand(); + var isOccupancyBooking = getOccupancyRequiredForBooking($(callerElement).closest('.booking_room_fields')); + ajaxCart.lastOccupancyRequiredForBooking = isOccupancyBooking; + // create from data in order to manage adding different type of products var req = new FormData(); req.append('controller', 'cart'); @@ -398,7 +401,7 @@ var ajaxCart = { if (typeof dateTo != 'undefined') req.append('dateTo', dateTo); - if (occupancy_required_for_booking) { + if (isOccupancyBooking) { req.append('occupancy', JSON.stringify(occupancy)); } else { req.append('qty', ((occupancy && occupancy != null) ? occupancy : '1')); @@ -425,6 +428,7 @@ var ajaxCart = { contentType: false, processData: false, success: function(jsonData, textStatus, jqXHR) { + console.log(jsonData); if (pagename == 'product') { if (jsonData.avail_rooms == 0) { disableRoomTypeDemands(1); @@ -1203,16 +1207,29 @@ var ajaxCart = { $('#layer_cart_product_quantity').parent().show(); var product_quantity_text = ''; if(parseInt(product.booking_product)) { + var roomLabel = product.attribute_type || (typeof room_txt !== 'undefined' ? room_txt : 'Room'); + var roomsLabel = product.attribute_types || (typeof rooms_txt !== 'undefined' ? rooms_txt : roomLabel); + applyRoomLabelsToLayer(roomLabel, roomsLabel); let rooms = 0; let adults = 0; let children = 0; - if (occupancy_required_for_booking) { + var isOccupancyBooking = (typeof ajaxCart.lastOccupancyRequiredForBooking !== 'undefined') ? ajaxCart.lastOccupancyRequiredForBooking : occupancy_required_for_booking; + var $roomLabel = $('#layer_cart .layer_cart_room_txt .layer_cart_attribute_type'); + if ($roomLabel.length) { + var $labelContainer = $roomLabel.closest('.layer_cart_room_txt'); + var labelTemplate = isOccupancyBooking ? $labelContainer.data('label-occupancy') : $labelContainer.data('label-quantity'); + if (labelTemplate) { + var labelText = labelTemplate.replace(/__ROOMS__/g, roomsLabel).replace(/__ROOM__/g, roomLabel); + $roomLabel.text(labelText); + } + } + if (isOccupancyBooking) { $.each(product.occupancy, function(index, val) { rooms++; adults += parseInt(val.adults); children += parseInt(val.children); }); - product_quantity_text = getRoomTypeGuestOccupancyFormated(adults, children, rooms); + product_quantity_text = getRoomTypeGuestOccupancyFormated(adults, children, rooms, roomLabel, roomsLabel); } else { product_quantity_text = product.occupancy; } @@ -1454,7 +1471,8 @@ function getBookingOccupancyDetails(bookingform, booking_product) { let occupancy; if (booking_product) { - if (occupancy_required_for_booking) { + var isOccupancyBooking = getOccupancyRequiredForBooking(bookingform); + if (isOccupancyBooking) { $('.booking_guest_occupancy_conatiner .dropdown').removeClass('open'); let selected_occupancy = $(bookingform).find(".occupancy_info_block.selected") if (selected_occupancy.length) { @@ -1496,3 +1514,30 @@ function getBookingOccupancyDetails(bookingform, booking_product) return occupancy; } + +function applyRoomLabelsToLayer(roomLabel, roomsLabel) +{ + var $layer = $('#layer_cart'); + $layer.find('[data-room-msg-template]').each(function() { + var template = $(this).attr('data-room-msg-template'); + if (!template) { + return; + } + var text = template.replace(/__ROOMS__/g, roomsLabel).replace(/__ROOM__/g, roomLabel); + $(this).text(text); + }); +} + +function getOccupancyRequiredForBooking(bookingform) { + var value = occupancy_required_for_booking; + var $form = bookingform ? $(bookingform) : $('#booking-form').closest('.booking_room_fields'); + + if ($form.length) { + var dataVal = $form.data('occupancy-required'); + if (dataVal !== undefined) { + value = parseInt(dataVal) === 1; + } + } + + return value; +} diff --git a/themes/hotel-reservation-theme/js/occupancy.js b/themes/hotel-reservation-theme/js/occupancy.js index fddb7006f..428a20cee 100644 --- a/themes/hotel-reservation-theme/js/occupancy.js +++ b/themes/hotel-reservation-theme/js/occupancy.js @@ -27,10 +27,11 @@ $(document).ready(function(){ booking_occupancy_inner = $(this).closest('.booking_occupancy_inner'); var booking_occupancy_wrapper = $(this).closest('.booking_occupancy_wrapper'); + var roomLabels = getRoomLabels(booking_occupancy_wrapper); $(this).closest('.occupancy_info_block').hide('fast', function(){ $(this).remove() $(booking_occupancy_inner).find('.room_num_wrapper').each(function(key, val) { - $(this).text(room_txt + ' - '+ (key+1) ); + $(this).text(roomLabels.room + ' - '+ (key+1) ); }); var countRooms = parseInt($(booking_occupancy_wrapper).find('.occupancy_info_block').length); if (countRooms < $(booking_occupancy_wrapper).find('.max_avail_type_qty').val()) { @@ -236,10 +237,11 @@ $(document).ready(function(){ return true; } - $(document).on('click', '.booking_occupancy_wrapper .add_new_occupancy_btn', function(e) { + $(document).on('click', '.booking_occupancy_wrapper .add_new_occupancy_btn', function(e) { e.preventDefault(); var booking_occupancy_wrapper = $(this).closest('.booking_occupancy_wrapper'); + var roomLabels = getRoomLabels(booking_occupancy_wrapper); var occupancy_block = ''; var roomBlockIndex = parseInt($(booking_occupancy_wrapper).find(".occupancy_info_block").last().attr('occ_block_index')); roomBlockIndex += 1; @@ -252,7 +254,7 @@ $(document).ready(function(){ && countRooms <= $(booking_occupancy_wrapper).find('.max_avail_type_qty').val() ) { occupancy_block += '

      - + - + - + diff --git a/themes/hotel-reservation-theme/product.tpl b/themes/hotel-reservation-theme/product.tpl index 9492fbc86..d7d9f8dc6 100644 --- a/themes/hotel-reservation-theme/product.tpl +++ b/themes/hotel-reservation-theme/product.tpl @@ -205,14 +205,18 @@ {/block} {/if} - + {if isset($room_type_info['room_type_selling_type_name']) && $room_type_info['room_type_selling_type_name']} + {assign var=attribute_type value=$room_type_info['room_type_selling_type_name']} + {else} + {assign var=attribute_type value={l s='Room'}} + {/if}
      {block name='product_tabs'}
        -
      • {if $product->booking_product}{l s='Room Information'}{else}{l s='Product Information'}{/if}
        • +
      • {if $product->booking_product}{l s='%s Information' sprintf=$attribute_type}{else}{l s='Product Information'}{/if}
        • {* Block for booking products *} {if isset($id_hotel) && $id_hotel}
      • {l s='Refund Policies'}
        • @@ -282,7 +286,7 @@ {if isset($features) && $features}
        - {l s='Room Features'} + {l s='%s Features' sprintf=$attribute_type}
        {foreach from=$features key=ftr_k item=ftr_v} @@ -302,7 +306,7 @@ {if isset($hotel_features) && $hotel_features}
        - {l s='Hotel Features'} + {l s='%s Features' sprintf=$property_type}
        {foreach from=$hotel_features key=ftr_k item=ftr_v} @@ -316,7 +320,7 @@ {if isset($hotel_description) && $hotel_description}
        - {l s='Hotel Description'} + {l s='%s Description' sprintf=$property_type}
        {$hotel_description} @@ -365,7 +369,7 @@ {if isset($hotel_policies) && $hotel_policies}
        - {l s='Hotel Policies'} + {l s='%s Policies' sprintf=$property_type}

        {$hotel_policies}

        diff --git a/themes/hotel-reservation-theme/shopping-cart-detail.tpl b/themes/hotel-reservation-theme/shopping-cart-detail.tpl index ccbb199e7..9c894f7ff 100644 --- a/themes/hotel-reservation-theme/shopping-cart-detail.tpl +++ b/themes/hotel-reservation-theme/shopping-cart-detail.tpl @@ -91,6 +91,13 @@ {/block} {block name='shopping_cart_room_type_booking_information'} {assign var="is_full_date" value=($show_full_date && ($rm_v['data_form']|date_format:'%D' == $rm_v['data_to']|date_format:'%D'))} + {if isset($data_v['room_type_selling_type_name']) && $data_v['room_type_selling_type_name']} + {assign var=attribute_type value=$data_v['room_type_selling_type_name']} + {assign var=attribute_types value=$data_v['room_type_selling_type_name']|cat:'s'} + {else} + {assign var=attribute_type value={l s='Room'}} + {assign var=attribute_types value={l s='Rooms'}} + {/if}

        {l s='CHECK IN'}

        @@ -103,7 +110,7 @@

        {l s='OCCUPANCY'}

        - {if {$rm_v['adults']} <= 9}0{$rm_v['adults']}{else}{$rm_v['adults']}{/if} {if $rm_v['adults'] > 1}{l s='Adults'}{else}{l s='Adult'}{/if}{if $rm_v['children']}, {if $rm_v['children'] <= 9}0{$rm_v['children']}{else}{$rm_v['children']}{/if} {if $rm_v['children'] > 1}{l s='Children'}{else}{l s='Child'}{/if}{/if}, {if {$rm_v['num_rm']} <= 9}0{/if}{$rm_v['num_rm']}{if $rm_v['num_rm'] > 1} {l s='Rooms'}{else} {l s='Room'}{/if} + {if {$rm_v['adults']} <= 9}0{$rm_v['adults']}{else}{$rm_v['adults']}{/if} {if $rm_v['adults'] > 1}{l s='Adults'}{else}{l s='Adult'}{/if}{if $rm_v['children']}, {if $rm_v['children'] <= 9}0{$rm_v['children']}{else}{$rm_v['children']}{/if} {if $rm_v['children'] > 1}{l s='Children'}{else}{l s='Child'}{/if}{/if}, {if {$rm_v['num_rm']} <= 9}0{/if}{$rm_v['num_rm']}{if $rm_v['num_rm'] > 1} {$attribute_types|escape:'html':'UTF-8'}{else} {$attribute_type|escape:'html':'UTF-8'}{/if}

        @@ -137,7 +144,7 @@ {/if}

        - {l s='Total rooms price'} {if $display_tax_label}{if $priceDisplay} {l s='(Excl.'} {else}{l s='(Incl.)'}{/if} {l s='all taxes.)'}{/if} + {l s='Total %s price' sprintf=$attribute_types|escape:'html':'UTF-8'} {if $display_tax_label}{if $priceDisplay} {l s='(Excl.'} {else}{l s='(Incl.)'}{/if} {l s='all taxes.)'}{/if}

      {l s='Room No.' mod='hotelreservationsystem'}{l s='%s No.' sprintf=$book_v['room_type_selling_type_name'] mod='hotelreservationsystem'} {l s='Status' mod='hotelreservationsystem'} {l s='Duration' mod='hotelreservationsystem'} {l s='Message' mod='hotelreservationsystem'}{l s='Room num' mod='hotelreservationsystem'} {l s='Room type' mod='hotelreservationsystem'}{l s='Hotel' mod='hotelreservationsystem'}{l s='Property' mod='hotelreservationsystem'} {l s='Duration' mod='hotelreservationsystem'} {l s='Total cost (tax incl.)' mod='hotelreservationsystem'} {l s='Total paid amount (tax incl.)' mod='hotelreservationsystem'}
      - {l s='Total Rooms Cost'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if} {/if} + {l s='Total Stay Cost'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if} {/if} {if $priceDisplay && $use_tax} diff --git a/themes/hotel-reservation-theme/order-detail.tpl b/themes/hotel-reservation-theme/order-detail.tpl index 9402a240d..c6f5c2351 100644 --- a/themes/hotel-reservation-theme/order-detail.tpl +++ b/themes/hotel-reservation-theme/order-detail.tpl @@ -78,7 +78,7 @@ {if isset($obj_hotel_branch_information) && $obj_hotel_branch_information}
      - {l s='Hotel Details'} + {l s='%s Details' sprintf=$property_name}
      @@ -102,7 +102,7 @@
      -
      {l s='Hotel Name'}
      +
      {l s='%s Name' sprintf=$property_name}
      {$obj_hotel_branch_information->hotel_name}
      {l s='Phone Number'}
      @@ -176,7 +176,7 @@ {if isset($obj_hotel_branch_information)}
      {l s='Total rooms cost'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if} {/if}{l s='Total Stay Cost'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if} {/if} {if $priceDisplay && $use_tax} {displayWtPriceWithCurrency price=($room_price_tax_excl + $room_services_price_tax_excl - $total_convenience_fee_te) currency=$currency} @@ -494,7 +494,7 @@
        {if $has_general_hotel_policies}
      • - {l s='Hotel Policies'} + {l s='%s Policies' sprintf=$property_name}
        • {/if} {if $has_refund_hotel_policies} @@ -675,7 +675,7 @@ {if isset($obj_hotel_branch_information)}
      {l s='Total rooms cost'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if} {/if}{l s='Total Stay Cost'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if} {/if} {if $priceDisplay && $use_tax} {displayWtPriceWithCurrency price=($room_price_tax_excl + $room_services_price_tax_excl - $total_convenience_fee_te) currency=$currency} @@ -956,14 +956,21 @@ {foreach from=$cart_htl_data key=data_k item=data_v} {foreach from=$data_v['date_diff'] key=rm_k item=rm_v}
      + {if isset($data_v.room_type_selling_type_name) && $data_v.room_type_selling_type_name} + {assign var=attribute_type value=$data_v.room_type_selling_type_name} + {assign var=attribute_types value=$data_v.room_type_selling_type_name|cat:'s'} + {else} + {assign var=attribute_type value={l s='Room'}} + {assign var=attribute_types value={l s='Rooms'}} + {/if}

      {$data_v.name}

      -

      {l s='Total Rooms'}

      +

      {l s='Total %s' sprintf=$attribute_types|escape:'html':'UTF-8'}

      {$rm_v.num_rm|string_format:'%02d'}
      -

      {l s='Cancelled Rooms'}

      +

      {l s='Cancelled %s' sprintf=$attribute_types|escape:'html':'UTF-8'}

      {($rm_v.count_cancelled + $rm_v.count_refunded)|string_format:'%02d'}
      @@ -975,7 +982,7 @@
      ({$hotel_booking_detail.adults|string_format:'%02d'} {if $hotel_booking_detail.adults > 1}{l s='Adults'}{else}{l s='Adult'}{/if}{if $hotel_booking_detail.children > 0}{l s=', '}{$hotel_booking_detail.children|string_format:'%02d'} {if $hotel_booking_detail.children > 1}{l s='Children'}{else}{l s='Child'}{/if}{/if}) @@ -1016,7 +1023,7 @@
      {else}
      -

      {l s='No extra services added for this room.'}

      +

      {l s='No extra services added for this %s.' sprintf=$attribute_type|escape:'html':'UTF-8'}

      {/if}
      diff --git a/themes/hotel-reservation-theme/order-return.tpl b/themes/hotel-reservation-theme/order-return.tpl index 4ef1909b3..6b14106e1 100644 --- a/themes/hotel-reservation-theme/order-return.tpl +++ b/themes/hotel-reservation-theme/order-return.tpl @@ -61,7 +61,7 @@
      {l s='Rooms'} {l s='Room type'}{l s='Hotel'}{l s='Property Name'} {l s='Duration'} {l s='Total rooms price (tax incl.)'} {l s='Extra services price (tax incl.)'}