Daniel/hotel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove extra const from product class and hotel booking detail class, add validation

Browse Source
This commit is contained in:
Amit sharma
2026-05-20 12:33:53 +05:30
parent 1321d387b9
commit 748811250c
86 changed files with 330 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
admin/themes/default/template/controllers/cart_rules/actions.tpl
View File

@@ -85,26 +85,26 @@
<p class="radio">
<label for="apply_discount_to_product">
<input type="radio" name="apply_discount_to" id="apply_discount_to_product" value="specific"{if $currentTab->getFieldValue($currentObject, 'reduction_product')|intval > 0} checked="checked"{/if} />
{l s='Specific Stay type'}
{l s='Specific Room type'}
</label>
</p>
<p class="radio">
<label for="apply_discount_to_cheapest">
<input type="radio" name="apply_discount_to" id="apply_discount_to_cheapest" value="cheapest"{if $currentTab->getFieldValue($currentObject, 'reduction_product')|intval == -1} checked="checked"{/if} />
{l s='Cheapest Stay type'}
{l s='Cheapest Room type'}
</label>
</p>
<p class="radio">
<label for="apply_discount_to_selection">
<input type="radio" name="apply_discount_to" id="apply_discount_to_selection" value="selection"{if $currentTab->getFieldValue($currentObject, 'reduction_product')|intval == -2} checked="checked"{/if}{if $product_rule_groups|@count == 0}disabled="disabled"{/if} />
{l s='Selected Stay Type(s)'}{if $product_rule_groups|@count == 0}&nbsp;<span id="apply_discount_to_selection_warning" class="text-muted clearfix"><i class="icon-warning-sign"></i> <a href="#" id="apply_discount_to_selection_shortcut">{l s='You must select some stay types first'}</a></span>{/if}
{l s='Selected Room Type(s)'}{if $product_rule_groups|@count == 0}&nbsp;<span id="apply_discount_to_selection_warning" class="text-muted clearfix"><i class="icon-warning-sign"></i> <a href="#" id="apply_discount_to_selection_shortcut">{l s='You must select some room types first'}</a></span>{/if}
</label>
</p>
</div>
</div>
<div id="apply_discount_to_product_div" class="form-group">
<label class="control-label col-lg-3">{l s='Stay Type'}</label>
<label class="control-label col-lg-3">{l s='Room Type'}</label>
<div class="col-lg-9">
<div class="input-group col-lg-5">
<input type="text" id="reductionProductFilter" name="reductionProductFilter" value="{$reductionProductFilter|escape:'html':'UTF-8'}" />

4
admin/themes/default/template/controllers/cart_rules/conditions.tpl
View File

@@ -255,7 +255,7 @@
<p class="checkbox">
<label>
<input type="checkbox" id="product_restriction" name="product_restriction" value="1" {if $product_rule_groups|@count}checked="checked"{/if} />
{l s='Stay Type selection'}
{l s='Room Type selection'}
</label>
</p>
<div id="product_restriction_div">
@@ -266,7 +266,7 @@
{/foreach}
</table>
<a href="javascript:addProductRuleGroup();" class="btn btn-default ">
<i class="icon-plus-sign"></i> {l s='Stay Type selection'}
<i class="icon-plus-sign"></i> {l s='Room Type selection'}
</a>
</div>

2
admin/themes/default/template/controllers/cart_rules/product_rule.tpl
View File

@@ -3,7 +3,7 @@
<input type="hidden" name="product_rule_{$product_rule_group_id|intval}[]" value="{$product_rule_id}" />
<input type="hidden" name="product_rule_{$product_rule_group_id|intval}_{$product_rule_id|intval}_type" value="{$product_rule_type|escape}" />
{* Everything is on a single line in order to avoid a empty space between the [ ] and the word *}
[{if $product_rule_type == 'products'}{l s='Stay types:'}{elseif $product_rule_type == 'categories'}{l s='Categories:'}{elseif $product_rule_type == 'manufacturers'}{l s='Manufacturers:'}{elseif $product_rule_type == 'suppliers'}{l s='Suppliers'}{elseif $product_rule_type == 'attributes'}{l s='Attributes'}{/if}]
[{if $product_rule_type == 'products'}{l s='Room types:'}{elseif $product_rule_type == 'categories'}{l s='Categories:'}{elseif $product_rule_type == 'manufacturers'}{l s='Manufacturers:'}{elseif $product_rule_type == 'suppliers'}{l s='Suppliers'}{elseif $product_rule_type == 'attributes'}{l s='Attributes'}{/if}]
</td>
<td>
<input type="text" id="product_rule_{$product_rule_group_id|intval}_{$product_rule_id|intval}_match" value="" disabled="disabled" />

6
admin/themes/default/template/controllers/cart_rules/product_rule_group.tpl
View File

@@ -14,7 +14,7 @@
<input class="form-control" type="text" name="product_rule_group_{$product_rule_group_id|intval}_quantity" value="{$product_rule_group_quantity|intval}" />
</div>
<div class="col-lg-7">
<label class="control-label pull-left">{l s='Stay type(s) matching the following rules:'}</label>
<label class="control-label pull-left">{l s='Room type(s) matching the following rules:'}</label>
</div>
</div>
@@ -26,7 +26,7 @@
<div class="col-lg-4">
<select class="form-control" id="product_rule_type_{$product_rule_group_id|intval}">
<option value="">{l s='-- Choose --'}</option>
<option value="products">{l s='Stay Types'}</option>
<option value="products">{l s='Room Types'}</option>
{*<option value="attributes">{l s='Attributes'}</option>
<option value="categories">{l s='Categories'}</option>
<option value="manufacturers">{l s='Manufacturers'}</option>
@@ -42,7 +42,7 @@
</div>
{l s='The Stay Type(s) are matching one of these:'}
{l s='The Room Type(s) are matching one of these:'}
<table id="product_rule_table_{$product_rule_group_id|intval}" class="table table-bordered">
{if isset($product_rules) && $product_rules|@count}
{foreach from=$product_rules item='product_rule'}

2
admin/themes/default/template/controllers/carts/helpers/view/view.tpl
View File

@@ -81,7 +81,7 @@
<thead>
<tr>
<th class="fixed-width-xs"><span class="title_box">{l s='Image'}</span></th>
<th><span class="title_box">{l s='Stay Type'}</span></th>
<th><span class="title_box">{l s='Room Type'}</span></th>
<th><span class="title_box">{l s='Hotel'}</span></th>
<th><span class="title_box">{l s='Duration'}</span></th>
<th><span class="title_box">{l s='occupancy'}</span></th>

2
admin/themes/default/template/controllers/customer_threads/helpers/view/message.tpl
View File

@@ -55,7 +55,7 @@
<span class="message-date">&nbsp;<i class="icon-calendar"></i> - {dateFormat date=$message.date_add full=0} - <i class="icon-time"></i> {$message.date_add|substr:11:5}</span>
{if $message.private}<span class="badge badge-info">{l s='Private'}</span>{/if}
{if isset($message.file_name)} <span class="message-product">&nbsp;<i class="icon-link"></i> <a href="{$message.file_name|escape:'html':'UTF-8'}" class="_blank">{l s="Attachment"}</a></span>{/if}
{if isset($message.product_name)} <span class="message-attachment">&nbsp;<i class="icon-book"></i> <a href="{$message.product_link|escape:'html':'UTF-8'}" class="_blank">{if isset($message.booking_product) && $message.booking_product}{l s="Stay type:"}{else}{l s="Product:"}{/if} {$message.product_name|escape:'html':'UTF-8'} </a></span>{/if}
{if isset($message.product_name)} <span class="message-attachment">&nbsp;<i class="icon-book"></i> <a href="{$message.product_link|escape:'html':'UTF-8'}" class="_blank">{if isset($message.booking_product) && $message.booking_product}{l s="Room type:"}{else}{l s="Product:"}{/if} {$message.product_name|escape:'html':'UTF-8'} </a></span>{/if}
<p class="message-item-text">{$message.message|escape:'html':'UTF-8'|nl2br}</p>
</div>
</div>

6
admin/themes/default/template/controllers/customers/helpers/view/view.tpl
View File

@@ -358,7 +358,7 @@
{if $products AND count($products)}
<div class="panel">
<div class="panel-heading">
<i class="icon-archive"></i> {l s='Stay types and services'} <span class="badge">{count($products)}</span>
<i class="icon-archive"></i> {l s='Room types and services'} <span class="badge">{count($products)}</span>
</div>
<div class="nav nav-tabs">
<ul class="nav nav-tabs">
@@ -367,7 +367,7 @@
{if $count_room_types}
<li class="active">
<a data-toggle="tab" href="#purchased_room_types">
{l s='Stay Types'}
{l s='Room Types'}
<span class="label label-success">{$count_room_types}</span>
</a>
</li>
@@ -449,7 +449,7 @@
{if count($interested)}
<div class="panel">
<div class="panel-heading">
<i class="icon-eye"></i> {l s='Viewed stay types'} <span class="badge">{count($interested)}</span>
<i class="icon-eye"></i> {l s='Viewed room types'} <span class="badge">{count($interested)}</span>
</div>
<table class="table">
<thead>

2
admin/themes/default/template/controllers/import/helpers/form/form.tpl
View File

@@ -315,7 +315,7 @@
{l s='Sample Hotels file'}
</a>
<a class="list-group-item _blank" href="../docs/csv_import/room_types_import.csv">
{l s='Sample Stay Types file'}
{l s='Sample Room Types file'}
</a>
<a class="list-group-item _blank" href="../docs/csv_import/rooms_import.csv">
{l s='Sample Stays file'}

4
admin/themes/default/template/controllers/normal_products/associations.tpl
View File

@@ -46,13 +46,13 @@
</div>
<div class="form-group">
<div class="col-sm-6 col-sm-offset-3 alert alert-info">
{l s='Associations are used to display service product category wise on stay type page when'} <a href="{$link->getAdminLink('AdminPPreferences')}#conf_id_PS_SERVICE_PRODUCT_CATEGORY_FILTER" target="_blank">{l s='Category filter'}</a> {l s='is enabled'}
{l s='Associations are used to display service product category wise on room type page when'} <a href="{$link->getAdminLink('AdminPPreferences')}#conf_id_PS_SERVICE_PRODUCT_CATEGORY_FILTER" target="_blank">{l s='Category filter'}</a> {l s='is enabled'}
</div>
</div>
<div class="form-group">
<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="id_category_default" type="default"}</span></div>
<label class="control-label col-lg-2" for="id_category_default">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='The default category is the main category for your stay type, and is displayed by default.'}">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='The default category is the main category for your room type, and is displayed by default.'}">
{l s='Default category'}
</span>
</label>

4
admin/themes/default/template/controllers/normal_products/features.tpl
View File

@@ -23,10 +23,10 @@
{if isset($product->id)}
<div id="product-features" class="panel product-tab">
<input type="hidden" name="submitted_tabs[]" value="Features" />
<h3>{l s='Assign features to this stay type'}</h3>
<h3>{l s='Assign features to this room type'}</h3>
<div class="alert alert-info">
{l s='You can specify a value for each relevant feature regarding this stay type. Empty fields will not be displayed.'}<br/>
{l s='You can specify a value for each relevant feature regarding this room type. Empty fields will not be displayed.'}<br/>
{l s='You can either create a specific value, or select among the existing pre-defined values you\'ve previously added.'}
</div>

22
admin/themes/default/template/controllers/normal_products/informations.tpl
View File

@@ -30,8 +30,8 @@
<h3 class="tab"> <i class="icon-info"></i> {l s='Information'}</h3>
<script type="text/javascript">
var msg_select_one = "{l s='Please select at least one stay type.' js=1}";
var msg_set_quantity = "{l s='Please set a quantity to add a stay type.' js=1}";
var msg_select_one = "{l s='Please select at least one room type.' js=1}";
var msg_set_quantity = "{l s='Please set a quantity to add a room type.' js=1}";
{if isset($ps_force_friendly_product) && $ps_force_friendly_product}
var ps_force_friendly_product = 1;
@@ -232,15 +232,15 @@
{* Code For Standard product working *}
{* <div class="form-group" id="global_product_type_container">
<label class="control-label col-lg-3" for="selling_preference_type">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Select whether this product will be sold with stay type or as an standalone product'}">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Select whether this product will be sold with room type or as an standalone product'}">
{l s='Product selling preference'}
<span>
</label>
<div class="col-lg-4">
<select name="selling_preference_type" id="selling_preference_type">
<option value="{Product::SELLING_PREFERENCE_WITH_ROOM_TYPE}" {if $product->selling_preference_type == Product::SELLING_PREFERENCE_WITH_ROOM_TYPE}selected="selected"{/if} >{l s='Sell with stay types'}</option>
<option value="{Product::SELLING_PREFERENCE_WITH_ROOM_TYPE}" {if $product->selling_preference_type == Product::SELLING_PREFERENCE_WITH_ROOM_TYPE}selected="selected"{/if} >{l s='Sell with room types'}</option>
<option value="{Product::SELLING_PREFERENCE_HOTEL_STANDALONE}" {if $product->selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE}selected="selected"{/if} >{l s='Sell with hotels'}</option>
<option value="{Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE}" {if $product->selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE}selected="selected"{/if} >{l s='Sell with hotels and stay types'}</option>
<option value="{Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE}" {if $product->selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE}selected="selected"{/if} >{l s='Sell with hotels and room types'}</option>
<option value="{Product::SELLING_PREFERENCE_STANDALONE}" {if $product->selling_preference_type == Product::SELLING_PREFERENCE_STANDALONE}selected="selected"{/if} >{l s='Sell as standalone product'}</option>
</select>
</div>
@@ -248,7 +248,7 @@
<div class="form-group" id="associated_hotel_tree" {if ($product->selling_preference_type != Product::SELLING_PREFERENCE_HOTEL_STANDALONE && $product->selling_preference_type != Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE)}style="display:none;"{/if}>
<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="category_box" type="category_box"}</span></div>
<label class="control-label col-lg-2" for="hotel_block">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Select hotels for which this service will be available.'}">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Select properties for which this service will be available.'}">
{l s='Associated Hotels'}
</span>
</label>
@@ -261,8 +261,8 @@
<div class="form-group" id="associated_hotel_rooms_tree" {if ($product->selling_preference_type != Product::SELLING_PREFERENCE_WITH_ROOM_TYPE && $product->selling_preference_type != Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE && $product->selling_preference_type != 0)}style="display:none;"{/if}>
<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="category_box" type="category_box"}</span></div>
<label class="control-label col-lg-2" for="hotel_room_block">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Select stay type and hotels for which this service will be available.'}">
{l s='Associated Stay Types'}
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Select Room type and properties for which this service will be available.'}">
{l s='Associated Room Types'}
</span>
</label>
<div class="col-lg-9">
@@ -273,7 +273,7 @@
</div>
<div class="form-group" id="auto_add_to_cart_container" {if $product->selling_preference_type != Product::SELLING_PREFERENCE_WITH_ROOM_TYPE && $product->selling_preference_type != 0}style="display:none;"{/if}>
<label class="control-label col-lg-3" for="">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='When enabled, this service will be added in cart for each associated Stay type or Hotel when they are added in cart. Also auto added services will not be visible to customers.'}">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='When enabled, this service will be added in cart for each associated Room type or Hotel when they are added in cart. Also auto added services will not be visible to customers.'}">
{l s='Auto add to cart this product'}
</span>
</label>
@@ -462,7 +462,7 @@
<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="description" type="tinymce" multilang="true"}</span></div>
<label class="control-label col-lg-2" for="description_{$id_lang}">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='Appears in the body of the stay type.'}">
title="{l s='Appears in the body of the room type.'}">
{l s='Description'}
</span>
</label>
@@ -543,7 +543,7 @@
{* <div class="form-group">
<label class="control-label col-lg-3" for="tags_{$id_lang}">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='Will be displayed in the tags block when enabled. Tags help customers easily find your stay types.'}">
title="{l s='Will be displayed in the tags block when enabled. Tags help customers easily find your room types.'}">
{l s='Tags:'}
</span>
</label>

2
admin/themes/default/template/controllers/normal_products/prices.tpl
View File

@@ -139,7 +139,7 @@ $(document).ready(function () {
<div class="form-group {if $product->auto_add_to_cart && $product->price_addition_type == Product::PRICE_ADDITION_TYPE_WITH_ROOM}show_on_auto_add_Withroom{/if}" {if !$product->auto_add_to_cart || $product->price_addition_type != Product::PRICE_ADDITION_TYPE_WITH_ROOM}style="display:none"{/if}>
<div class="col-lg-9 col-lg-offset-3">
<div class="alert alert-info">
{l s='This service product price will be auto added to stay price so the tax rule set on stay type will be applied on this service product'}
{l s='This service product price will be auto added to stay price so the tax rule set on room type will be applied on this service product'}
</div>
</div>
</div>

4
admin/themes/default/template/controllers/normal_products/seo.tpl
View File

@@ -27,7 +27,7 @@
<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="meta_title" type="default" multilang="true"}</span></div>
<label class="control-label col-lg-2" for="meta_title_{$id_lang}">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='Public title for the product\'s page, and for search engines. Leave blank to use the stay type name.'} {l s='The number of remaining characters is displayed to the left of the field.'}">
title="{l s='Public title for the product\'s page, and for search engines. Leave blank to use the room type name.'} {l s='The number of remaining characters is displayed to the left of the field.'}">
{l s='Meta title'}
</span>
</label>
@@ -76,7 +76,7 @@
<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="link_rewrite" type="seo_friendly_url" multilang="true"}</span></div>
<label class="control-label col-lg-2" for="link_rewrite_{$id_lang}">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='This is the human-readable URL, as generated from the stay type\'s name. You can change it if you want.'}">
title="{l s='This is the human-readable URL, as generated from the room type\'s name. You can change it if you want.'}">
{l s='Friendly URL:'}
</span>

4
admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl
View File

@@ -35,7 +35,7 @@
<tr>
<th><span class="title_box">{l s='Stay No.'}</span></th>
<th><span class="title_box">{l s='Stay Image'}</th>
<th><span class="title_box">{l s='Stay Type'}</span></th>
<th><span class="title_box">{l s='Room Type'}</span></th>
<th><span class="title_box">{l s='Duration'}</span></th>
<th><span class="fixed-width-lg title_box">{l s='Occupancy / Quantity'}</span></th>
<th><span class="title_box">{l s='Unit Price (tax excl)'}</span></th>
@@ -147,7 +147,7 @@
<i class="icon-trash"></i>&nbsp;{l s='Delete'}
</button>
<br />
<a href="#" id_hotel_cart_booking="{$data.id|escape:'html':'UTF-8'}" id_room="{$data.id_room|escape:'html':'UTF-8'}" date_from="{$data.date_from|escape:'html':'UTF-8'}" date_to="{$data.date_to|escape:'html':'UTF-8'}" id_product="{$data.id_product|escape:'html':'UTF-8'}" id_cart="{$data.id_cart|escape:'html':'UTF-8'}" class="open_rooms_extra_demands btn btn-success" title="{l s='Click here to add or remove the extra services of this stay type.'}">
<a href="#" id_hotel_cart_booking="{$data.id|escape:'html':'UTF-8'}" id_room="{$data.id_room|escape:'html':'UTF-8'}" date_from="{$data.date_from|escape:'html':'UTF-8'}" date_to="{$data.date_to|escape:'html':'UTF-8'}" id_product="{$data.id_product|escape:'html':'UTF-8'}" id_cart="{$data.id_cart|escape:'html':'UTF-8'}" class="open_rooms_extra_demands btn btn-success" title="{l s='Click here to add or remove the extra services of this room type.'}">
<i class="icon-pencil"></i>&nbsp;{l s='Services'}
</a>
</td>

2
admin/themes/default/template/controllers/orders/_overbookings.tpl
View File

@@ -30,7 +30,7 @@
<table class="table table-striped">
<tr>
<th>{l s='Stay No.'}</th>
<th>{l s='Stay type.'}</th>
<th>{l s='Room type.'}</th>
<th>{l s='Duration'}</th>
<th>{l s='Occupancy'}</th>
<th>{l s='Confirmed booking order'}</th>

2
admin/themes/default/template/controllers/orders/_resolvable_overbookings.tpl
View File

@@ -42,7 +42,7 @@
<table class="table table-striped">
<tr>
<th>{l s='Stay No.'}</th>
<th>{l s='Stay type'}</th>
<th>{l s='Room type'}</th>
<th>{l s='Hotel'}</th>
<th>{l s='Duration'}</th>
<th>{l s='Order'}</th>

2
admin/themes/default/template/controllers/orders/_rooms_informaion_table.tpl
View File

@@ -29,7 +29,7 @@
<tr>
<th><span class="title_box">{l s='Stay No.'}</span></th>
<th><span class="title_box">{l s='Image'}</th>
<th><span class="title_box">{l s='Stay Type'}</span></th>
<th><span class="title_box">{l s='Room Type'}</span></th>
<th><span class="title_box">{l s='Duration'}</span></th>
<th class="fixed-width-lg"><span class="title_box">{l s='Occupancy'}</span></th>
<th><span class="title_box">{l s='Stay Price (Tax excl.)'}</span></th>

2
admin/themes/default/template/controllers/orders/helpers/list/list_header.tpl
View File

@@ -139,7 +139,7 @@
});
}
// manage Hotel and Stay type filter inputs
// manage Hotel and Room type filter inputs
$(document).on('change', '#filter_input_hotel_name', function () {
updateRoomTypeFilter();
updateHotelRoomsFilter(false);

4
admin/themes/default/template/controllers/orders/helpers/view/view.tpl
View File

@@ -1306,9 +1306,9 @@
{strip}
{addJsDefL name=no_rm_avail_txt}{l s='No stay available.' js=1}{/addJsDefL}
{addJsDefL name=no_realloc_rm_avail_txt}{l s='No stay available for reallocation.' js=1}{/addJsDefL}
{addJsDefL name=no_realloc_rm_type_avail_txt}{l s='No stay type available for reallocation.' js=1}{/addJsDefL}
{addJsDefL name=no_realloc_rm_type_avail_txt}{l s='No room type available for reallocation.' js=1}{/addJsDefL}
{addJsDefL name=no_swap_rm_avail_txt}{l s='No stay available for swap.' js=1}{/addJsDefL}
{addJsDefL name=slct_rm_type_err}{l s='Please select a stay type first.' js=1}{/addJsDefL}
{addJsDefL name=slct_rm_type_err}{l s='Please select a room type first.' js=1}{/addJsDefL}
{addJsDefL name=slct_rm_err}{l s='Please select a stay first.' js=1}{/addJsDefL}
{addJsDefL name=txtExtraDemandSucc}{l s='Updated Successfully' js=1}{/addJsDefL}
{addJsDefL name=atleastSelectTxt}{l s='Select at least one facility to update.' js=1}{/addJsDefL}

2
admin/themes/default/template/controllers/orders/modals/_add_order_extra_services_tab_content.tpl
View File

@@ -178,7 +178,7 @@
<input type="hidden" name="id_hotel_cart_booking" value="{$id_hotel_cart_booking}">
<div class="row form-group">
<div class="col-sm-12 help-block">
{l s='Note: If auto added service is enabled, then tax of the booking\'s stay type will be applicable.'}
{l s='Note: If auto added service is enabled, then tax of the booking\'s room type will be applicable.'}
</div>
</div>
<div class="modal-footer">

4
admin/themes/default/template/controllers/orders/modals/_add_room_booking.tpl
View File

@@ -24,9 +24,9 @@
<div id="new_room">
<input type="hidden" id="add_product_product_id" name="add_product[product_id]" value="0" />
<div class="form-group">
<label class="control-label">{l s='Stay Type:'}</label>
<label class="control-label">{l s='Room Type:'}</label>
<div class="input-group">
<input type="text" id="add_product_product_name" class="form-control" value="" placeholder="{l s='Enter the name of the stay type'}" />
<input type="text" id="add_product_product_name" class="form-control" value="" placeholder="{l s='Enter the name of the room type'}" />
<div class="input-group-addon">
<i class="icon-search"></i>
</div>

2
admin/themes/default/template/controllers/orders/modals/_cancel_room_bookings.tpl
View File

@@ -44,7 +44,7 @@
<tr>
<th></th>
<th>{l s='Stay No.'}</th>
<th>{l s='Stay Type'}</th>
<th>{l s='Room Type'}</th>
<th>{l s='Hotel Name'}</th>
<th>{l s='Duration'}</th>
<th>{l s='Total Price (Tax incl.)'}</th>

2
admin/themes/default/template/controllers/orders/modals/_extra_services_service_products_tab_content.tpl
View File

@@ -237,7 +237,7 @@
{if $roomTypeTaxRuleGroupExist}
<div class="row form-group">
<div class="col-sm-12 help-block">
{l s='Note: If auto added service is enabled, then tax of the booking\'s stay type will be applicable.'}
{l s='Note: If auto added service is enabled, then tax of the booking\'s room type will be applicable.'}
</div>
</div>
{/if}

6
admin/themes/default/template/controllers/orders/modals/_room_reallocation.tpl
View File

@@ -58,11 +58,11 @@
<div class="form-group">
<div class="row">
<div class="form-group col-sm-6">
<label for="realloc_avail_room_type" class="control-label model-label">{l s='Stay Type To Reallocate:'}</label>
<label for="realloc_avail_room_type" class="control-label model-label">{l s='Room Type To Reallocate:'}</label>
<input type="hidden" class="form-control modal_id_htl_booking" name="id_htl_booking">
<div class="realloc_avail_room_type_container">
<select class="form-control" name="realloc_avail_room_type" id="realloc_avail_room_type">
<option value="0" selected="selected">{l s='Select Stay Type'}</option>
<option value="0" selected="selected">{l s='Select Room Type'}</option>
</select>
</div>
<p class="error_text" id="realloc_sel_rm_type_err_p"></p>
@@ -89,7 +89,7 @@
</div>
<div class="row">
<div class="alert alert-warning col-sm-12 realloc_roomtype_change_message" style="display:none">
<p>{l s="If stay type is changed while stay reallocation then all additional facilities and services will be assigned to the selected stay of new stay type."}</p>
<p>{l s="If room type is changed while stay reallocation then all additional facilities and services will be assigned to the selected stay of new room type."}</p>
<p>{l s="If you want to change additional facilities or services, you can update by editing the stay after reallocation."}</p>
</div>
</div>

2
admin/themes/default/template/controllers/products/additionalfacilities.tpl
View File

@@ -24,7 +24,7 @@
<input type="hidden" name="submitted_tabs[]" value="AdditionalFacilities" />
<div class="panel">
<div class="panel-heading">
<i class="icon-user"></i> {l s='Stay Type Additional Facilities'}
<i class="icon-user"></i> {l s='Room Type Additional Facilities'}
</div>
<div class="alert alert-info">
{l s='To create new additional facilities please visit'} <a target="_blank" href="{$link->getAdminLink('AdminRoomTypeGlobalDemand')}">{l s='Additional facilities'}</a> {l s='page.'}

2
admin/themes/default/template/controllers/products/associations.tpl
View File

@@ -47,7 +47,7 @@
<div class="form-group">
<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="id_category_default" type="default"}</span></div>
<label class="control-label col-lg-2" for="id_category_default">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='The default category is the main category for your stay type, and is displayed by default.'}">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='The default category is the main category for your room type, and is displayed by default.'}">
{l s='Default category'}
</span>
</label>

4
admin/themes/default/template/controllers/products/features.tpl
View File

@@ -26,10 +26,10 @@
{if isset($product->id)}
<div id="product-features" class="panel product-tab">
<input type="hidden" name="submitted_tabs[]" value="Features" />
<h3>{l s='Assign features to this stay type'}</h3>
<h3>{l s='Assign features to this room type'}</h3>
<div class="alert alert-info">
{l s='You can specify a value for each relevant feature regarding this stay type. Empty fields will not be displayed.'}<br/>
{l s='You can specify a value for each relevant feature regarding this room type. Empty fields will not be displayed.'}<br/>
{l s='You can either create a specific value, or select among the existing pre-defined values you\'ve previously added.'}
</div>

2
admin/themes/default/template/controllers/products/helpers/form/form.tpl
View File

@@ -276,7 +276,7 @@
{/if}
{if !$product->active && $product->isAssociatedToShop()}
<div class="alert alert-info draft" >
{l s='Your stay type will be saved as a draft.'}
{l s='Your room type will be saved as a draft.'}
<a href="#" class="btn btn-default" onclick="submitAddProductAndPreview()" ><i class="icon-eye-open"></i>&nbsp;{l s='Save and preview'}</a>
<input type="hidden" name="fakeSubmitAddProductAndPreview" id="fakeSubmitAddProductAndPreview" />
</div>

2
admin/themes/default/template/controllers/products/images.tpl
View File

@@ -35,7 +35,7 @@
<label class="control-label col-lg-3 file_upload_label">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='Format:'} JPG, GIF, PNG. {l s='Filesize:'} {$max_image_size|string_format:"%.2f"} {l s='MB max.'}">
{if isset($id_image)}{l s='Edit this stay type\'s image:'}{else}{l s='Add a new image to this stay type'}{/if}
{if isset($id_image)}{l s='Edit this room type\'s image:'}{else}{l s='Add a new image to this room type'}{/if}
</span>
</label>
<div class="col-lg-9">

50
admin/themes/default/template/controllers/products/informations.tpl
View File

@@ -33,8 +33,8 @@
<h3 class="tab"> <i class="icon-info"></i> {l s='Information'}</h3>
<script type="text/javascript">
var msg_select_one = "{l s='Please select at least one stay type.' js=1}";
var msg_set_quantity = "{l s='Please set a quantity to add a stay type.' js=1}";
var msg_select_one = "{l s='Please select at least one room type.' js=1}";
var msg_set_quantity = "{l s='Please set a quantity to add a room type.' js=1}";
{if isset($ps_force_friendly_product) && $ps_force_friendly_product}
var ps_force_friendly_product = 1;
@@ -95,7 +95,7 @@
</script>
{if isset($display_common_field) && $display_common_field}
<div class="alert alert-warning" style="display: block">{l s='Warning, if you change the value of fields with an orange bullet %s, the value will be changed for all other shops for this stay type' sprintf=$bullet_common_field}</div>
<div class="alert alert-warning" style="display: block">{l s='Warning, if you change the value of fields with an orange bullet %s, the value will be changed for all other shops for this room type' sprintf=$bullet_common_field}</div>
{/if}
{include file="controllers/products/multishop/check_fields.tpl" product_tab="Informations"}
@@ -103,7 +103,7 @@
<div class="form-group">
<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="name" type="default" multilang="true"}</span></div>
<label class="control-label col-lg-2 required" id="name" for="name_{$id_lang}">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Write the name of the Stay Type for ex. Delux, Executive etc.'} {l s='Invalid characters:'} &lt;&gt;;=#{}">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Write the name of the Room Type for ex. Delux, Executive etc.'} {l s='Invalid characters:'} &lt;&gt;;=#{}">
{l s='Name'}
</span>
</label>
@@ -155,7 +155,7 @@
<div class="form-group hidden">
<label class="control-label col-lg-3" for="reference">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='Your internal reference code for this stay type.'} {l s='Allowed special characters:'} .-_#\">
title="{l s='Your internal reference code for this room type.'} {l s='Allowed special characters:'} .-_#\">
{$bullet_common_field} {l s='Reference code'}
</span>
</label>
@@ -167,7 +167,7 @@
<div class="form-group hidden">
<label class="control-label col-lg-3" for="ean13">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='This type of stay type code is specific to Europe and Japan, but is widely used internationally. It is a superset of the UPC code: all products marked with an EAN will be accepted in North America.'}">
title="{l s='This type of room type code is specific to Europe and Japan, but is widely used internationally. It is a superset of the UPC code: all products marked with an EAN will be accepted in North America.'}">
{$bullet_common_field} {l s='EAN-13 or JAN barcode'}
</span>
</label>
@@ -179,7 +179,7 @@
<div class="form-group hidden">
<label class="control-label col-lg-3" for="upc">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='This type of stay type code is widely used in the United States, Canada, the United Kingdom, Australia, New Zealand and in other countries.'}">
title="{l s='This type of room type code is widely used in the United States, Canada, the United Kingdom, Australia, New Zealand and in other countries.'}">
{$bullet_common_field} {l s='UPC barcode'}
</span>
</label>
@@ -228,8 +228,8 @@
<div class="col-lg-9 col-lg-offset-3">
<div class="alert alert-info">
{l s='404 Not Found = Do not redirect and display a 404 page.'}<br/>
{l s='301 Moved Permanently = Permanently display another stay type instead.'}<br/>
{l s='302 Moved Temporarily = Temporarily display another stay type instead.'}
{l s='301 Moved Permanently = Permanently display another room type instead.'}<br/>
{l s='302 Moved Temporarily = Temporarily display another room type instead.'}
</div>
</div>
</div>
@@ -237,7 +237,7 @@
<div class="form-group redirect_product_options redirect_product_options_product_choise" style="display:none">
<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="id_product_redirected" type="radio" onclick=""}</span></div>
<label class="control-label col-lg-2" for="related_product_autocomplete_input">
{l s='Related stay type'}
{l s='Related room type'}
</label>
<div class="col-lg-7">
<input type="hidden" value="" name="id_product_redirected" />
@@ -248,7 +248,7 @@
</div>
<div class="form-control-static">
<span id="related_product_name"><i class="icon-warning-sign"></i>&nbsp;{l s='No related stay type.'}</span>
<span id="related_product_name"><i class="icon-warning-sign"></i>&nbsp;{l s='No related room type.'}</span>
<span id="related_product_remove" style="display:none">
<a class="btn btn-default" href="#" onclick="removeRelatedProduct(); return false" id="related_product_remove_link">
<i class="icon-remove text-danger"></i>
@@ -258,7 +258,7 @@
</div>
<script>
var no_related_product = '{l s='No related stay type.'}';
var no_related_product = '{l s='No related room type.'}';
var id_product_redirected = {$product->id_product_redirected|intval};
var product_name_redirected = '{$product_name_redirected|escape:'html':'UTF-8'}';
</script>
@@ -280,7 +280,7 @@
<div class="form-group" id="show_at_front_container">
<label class="control-label col-lg-3">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Enable if you want this stay type to be shown and to be available for booking from front office.'}">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Enable if you want this room type to be shown and to be available for booking from front office.'}">
{l s='Show at front office'}
</span>
</label>
@@ -352,7 +352,7 @@
<div class="form-group">
<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="description_short" type="tinymce" multilang="true"}</span></div>
<label class="control-label col-lg-2" for="description_short_{$id_lang}">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Appears in the stay type list(s), and at the top of the stay type page.'}">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Appears in the room type list(s), and at the top of the room type page.'}">
{l s='Short description'}
</span>
</label>
@@ -369,7 +369,7 @@
<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="description" type="tinymce" multilang="true"}</span></div>
<label class="control-label col-lg-2" for="description_{$id_lang}">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='Appears in the body of the stay type.'}">
title="{l s='Appears in the body of the room type.'}">
{l s='Description'}
</span>
</label>
@@ -450,15 +450,15 @@
{if isset($product->id) && $product->id}
<div class="form-group">
<label class="control-label col-lg-3" id="category_position" for="category_position">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Set display position of stay type on the search results page.'}">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Set display position of room type on the search results page.'}">
{l s='Position'}
</span>
</label>
<div class="col-lg-9">
<input type="text" id="category_position" class="form-control fixed-width-lg" name="category_position" value="{$category_position}" />
<p class="help-block">{l s='Please note that position numbering starts from 0. A position of 0 means stay type will be displayed at the topmost position.'}</p>
<p class="help-block">{l s='Please note that position numbering starts from 0. A position of 0 means room type will be displayed at the topmost position.'}</p>
<div class="alert alert-info">
{l s='You can manage positions of the stay types of this hotel from'}
{l s='You can manage positions of the room types of this hotel from'}
<a href="{$link->getAdminLink('AdminProducts')}&submitResetproduct&submitFilterproduct=1&productFilter_a!id_category_default={$htl_full_info['id_category']}">{l s='here.'}</a>
</div>
</div>
@@ -468,8 +468,8 @@
{if isset($room_type_selling_object_info) && $room_type_selling_object_info}
<div class="form-group" id="room_type_selection">
<label class="control-label col-sm-3">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Select the stay selling type for this stay type.'}">
{l s='Stay Type Selling'}
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Select the stay selling type for this room type.'}">
{l s='Room Type Selling'}
</span>
</label>
<div class="col-sm-5">
@@ -489,7 +489,7 @@
<div class="form-group">
<div class="col-lg-1"></span></div>
<label class="control-label col-lg-2">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Override the global booking method setting for this stay type.'}">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Override the global booking method setting for this room type.'}">
{l s='Search Type'}
</span>
</label>
@@ -513,7 +513,7 @@
<div class="form-group booking_method_product_options" {if !$has_booking_method}style="display:none;"{/if}>
<label class="control-label col-sm-3">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Override the global booking method setting for this stay type.'}">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Override the global booking method setting for this room type.'}">
{l s='Booking Method'}
</span>
</label>
@@ -531,7 +531,7 @@
</div>
<div class="form-group" id="bed_types_selection">
<label class="control-label col-sm-3">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Select all bed types available for this stay type.'}">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Select all bed types available for this room type.'}">
{l s='Bed Types'}
</span>
</label>
@@ -547,7 +547,7 @@
{* <div class="form-group">
<label class="control-label col-lg-3" for="tags_{$id_lang}">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='Will be displayed in the tags block when enabled. Tags help customers easily find your stay types.'}">
title="{l s='Will be displayed in the tags block when enabled. Tags help customers easily find your room types.'}">
{l s='Tags:'}
</span>
</label>
@@ -607,5 +607,5 @@
</div>
<script type="text/javascript">
hideOtherLanguage({$default_form_language});
var missing_product_name = '{l s='Please fill stay type name input field' js=1}';
var missing_product_name = '{l s='Please fill room type name input field' js=1}';
</script>

4
admin/themes/default/template/controllers/products/lengthofstay.tpl
View File

@@ -32,7 +32,7 @@
<li>{l s='Set 1 day for setting no limit on Minimum length of stay'}</li>
<li>{l s='Set 0 day for setting no limit on Maximum length of stay'}</li>
<li>{l s='Enable "Length of stay for date ranges" for setting values of \"Minimum length of stay\" and \"Maximum length of stay\" according to different date ranges'}</li>
<li>{l s='Length of stays (minimum|maximum) of all the dates which does not fall under the date ranges of \"Length of stay for date ranges\", will be taken from the global values of length of stays of this stay type.'}</li>
<li>{l s='Length of stays (minimum|maximum) of all the dates which does not fall under the date ranges of \"Length of stay for date ranges\", will be taken from the global values of length of stays of this room type.'}</li>
<li>{l s='\"Date to\" will not be included in the date range of \"Length of stay for date ranges\".'}</li>
</ul>
</div>
@@ -60,7 +60,7 @@
<div class="form-group">
<label class="control-label col-sm-3 required" for="max_los">
<span title="" data-toggle="tooltip" class="label-tooltip" data-original-title="{l s='Enter maximum length of stay for the hotel. set 0 day for setting no limit on maximum length of stay.'}">{l s='Maximum length of stay'}</span>
<span title="" data-toggle="tooltip" class="label-tooltip" data-original-title="{l s='Enter maximum length of stay for the property. set 0 day for setting no limit on maximum length of stay.'}">{l s='Maximum length of stay'}</span>
</label>
<div class="col-sm-9">
<div class="row">

4
admin/themes/default/template/controllers/products/modal-duplicate-options.tpl
View File

@@ -29,7 +29,7 @@
<div class="form-group">
<label class="control-label col-lg-3">
<span class="label-tooltip" data-toggle="tooltip" data-html="true"
title="{l s="Select hotel to assign duplicated stay type to."}">
title="{l s="Select hotel to assign duplicated room type to."}">
{l s="Select hotel"}
</span>
</label>
@@ -47,7 +47,7 @@
<div class="form-group">
<label class="control-label col-lg-3">
<span class="label-tooltip" data-toggle="tooltip" data-html="true"
title="{l s="Choose whether to copy images to duplicated stay type."}">
title="{l s="Choose whether to copy images to duplicated room type."}">
{l s="Duplicate images"}
</span>
</label>

14
admin/themes/default/template/controllers/products/occupancy.tpl
View File

@@ -27,8 +27,8 @@
<h3 class="tab"> <i class="icon-users"></i> {l s='Occupancy'}</h3>
<div class="alert alert-info">
{l s='Below, enter the base occupancy of this stay type.'}
<p><b>{l s='Note'}</b>: {l s='Minimum 1 adult is madatory in the base occupancy of the stay type'}</p>
{l s='Below, enter the base occupancy of this room type.'}
<p><b>{l s='Note'}</b>: {l s='Minimum 1 adult is madatory in the base occupancy of the room type'}</p>
</div>
<div class="form-group">
@@ -58,15 +58,15 @@
<hr>
<div class="alert alert-info">
{l s='Below, enter the maximum number of adults and children which can be accommodated in a stay of this stay type.'}
{l s='Below, enter the maximum number of adults and children which can be accommodated in a stay of this room type.'}
<br>
{l s='For maximum stay occupancy, the total number of guests which can be accommodated in a stay of this stay type.'}
{l s='For maximum stay occupancy, the total number of guests which can be accommodated in a stay of this room type.'}
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="max_adults">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='Enter maximum number of adults can be accommodated in a stay of this stay type.'}">
title="{l s='Enter maximum number of adults can be accommodated in a stay of this room type.'}">
{l s='Maximum adults'}
</span>
</label>
@@ -77,7 +77,7 @@
<div class="form-group">
<label class="control-label col-sm-2" for="max_children">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='Enter maximum number of children can be accommodated in a stay of this stay type.'}">
title="{l s='Enter maximum number of children can be accommodated in a stay of this room type.'}">
{l s='Maximum children'}
</span>
</label>
@@ -88,7 +88,7 @@
<div class="form-group">
<label class="control-label col-sm-2" for="max_guests">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='Enter maximum number of guests can be accommodated in a stay of this stay type.'}">
title="{l s='Enter maximum number of guests can be accommodated in a stay of this room type.'}">
{l s='Maximum stay occupancy'}
</span>
</label>

22
admin/themes/default/template/controllers/products/prices.tpl
View File

@@ -108,7 +108,7 @@ $(document).ready(function () {
{capture assign=priceDisplayPrecisionFormat}{'%.'|cat:$smarty.const._PS_PRICE_DISPLAY_PRECISION_|cat:'f'}{/capture}
<div id="product-prices" class="panel product-tab">
<input type="hidden" name="submitted_tabs[]" value="Prices" />
<h3>{l s='Stay type price'}</h3>
<h3>{l s='Room type price'}</h3>
<div class="alert alert-info" {if !$country_display_tax_label || $tax_exclude_taxe_option}style="display:none;"{/if}>
{l s='You must enter either the pre-tax retail price, or the retail price with tax. The input field will be automatically calculated.'}
</div>
@@ -116,20 +116,20 @@ $(document).ready(function () {
<div class="form-group">
<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="wholesale_price" type="default"}</span></div>
<label class="control-label col-lg-2" for="wholesale_price">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='The operating cost is the expense related to the operation of the stay type. Do not include the tax.'}">{if !$country_display_tax_label || $tax_exclude_taxe_option}{l s='Operating cost'}{else}{l s='Pre-tax operating cost'}{/if}</span>
<span class="label-tooltip" data-toggle="tooltip" title="{l s='The operating cost is the expense related to the operation of the room type. Do not include the tax.'}">{if !$country_display_tax_label || $tax_exclude_taxe_option}{l s='Operating cost'}{else}{l s='Pre-tax operating cost'}{/if}</span>
</label>
<div class="col-lg-2">
<div class="input-group">
<span class="input-group-addon">{$currency->prefix}{$currency->suffix}</span>
<input maxlength="27" name="wholesale_price" id="wholesale_price" type="text" value="{{toolsConvertPrice price=$product->wholesale_price}|string_format:$priceDisplayPrecisionFormat}" onchange="this.value = this.value.replace(/,/g, '.');" />
</div>
{if isset($pack) && $pack->isPack($product->id)}<p class="help-block">{l s='The sum of wholesale prices of the stay types in the pack is %s%s%s' sprintf=[$currency->prefix,{toolsConvertPrice price=$pack->noPackWholesalePrice($product->id)|string_format:$priceDisplayPrecisionFormat},$currency->suffix]}</p>{/if}
{if isset($pack) && $pack->isPack($product->id)}<p class="help-block">{l s='The sum of wholesale prices of the room types in the pack is %s%s%s' sprintf=[$currency->prefix,{toolsConvertPrice price=$pack->noPackWholesalePrice($product->id)|string_format:$priceDisplayPrecisionFormat},$currency->suffix]}</p>{/if}
</div>
</div>
<div class="form-group">
<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="price" type="price"}</span></div>
<label class="control-label col-lg-2" for="priceTE">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='The pre-tax retail price is the price for which you intend sell this stay type to your customers. It should be higher than the pre-tax operating cost: the difference between the two will be your margin.'}">{if !$country_display_tax_label || $tax_exclude_taxe_option}{l s='Retail price'}{else}{l s='Pre-tax retail price'}{/if}</span>
<span class="label-tooltip" data-toggle="tooltip" title="{l s='The pre-tax retail price is the price for which you intend sell this room type to your customers. It should be higher than the pre-tax operating cost: the difference between the two will be your margin.'}">{if !$country_display_tax_label || $tax_exclude_taxe_option}{l s='Retail price'}{else}{l s='Pre-tax retail price'}{/if}</span>
</label>
<div class="col-lg-2">
<div class="input-group">
@@ -200,7 +200,7 @@ $(document).ready(function () {
<input id="priceType" name="priceType" type="hidden" value="TE" />
<input id="priceTI" name="priceTI" type="text" value="" onchange="noComma('priceTI');" maxlength="27" onkeyup="$('#priceType').val('TI');if (isArrowKey(event)) return; calcPriceTE();" />
</div>
{if isset($pack) && $pack->isPack($product->id)}<p class="col-lg-9 col-lg-offset-3 help-block">{l s='The sum of prices of the stay types in the pack is %s%s%s' sprintf=[$currency->prefix,{toolsConvertPrice price=$pack->noPackPrice($product->id)|string_format:$priceDisplayPrecisionFormat},$currency->suffix]}</p>{/if}
{if isset($pack) && $pack->isPack($product->id)}<p class="col-lg-9 col-lg-offset-3 help-block">{l s='The sum of prices of the room types in the pack is %s%s%s' sprintf=[$currency->prefix,{toolsConvertPrice price=$pack->noPackPrice($product->id)|string_format:$priceDisplayPrecisionFormat},$currency->suffix]}</p>{/if}
</div>
{* As no use in QloApps currently so commented *}
{* <div class="form-group">
@@ -236,7 +236,7 @@ $(document).ready(function () {
<div class="checkbox">
<label class="control-label" for="on_sale" >
<input type="checkbox" name="on_sale" id="on_sale" {if $product->on_sale}checked="checked"{/if} value="1" />
{l s='Display the "on sale" icon on the stay type page, and in the text found within the stay type listing.'}
{l s='Display the "on sale" icon on the room type page, and in the text found within the room type listing.'}
</label>
</div>
</div>
@@ -270,7 +270,7 @@ $(document).ready(function () {
<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="price" type="price"}</span></div>
<label class="control-label col-sm-2">
<input type="hidden" name="id_adv_pmt" {if isset($adv_pay_dtl)}value="{$adv_pay_dtl['id']}"{/if}>
<span class="label-tooltip" data-toggle="tooltip" title="{l s='If Disabled, Advance payment will not apply on this stay type.'}">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='If Disabled, Advance payment will not apply on this room type.'}">
{l s='Allow Advance Payment'}
</span>
</label>
@@ -288,8 +288,8 @@ $(document).ready(function () {
<div class="form-group">
<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="price" type="price"}</span></div>
<label class="control-label col-sm-2">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='If disabled, Advance Payment for the stay type will be calculated By Global Advance payment settings.'}">
{l s='Apply Stay Type Advance Payment Setting.'}
<span class="label-tooltip" data-toggle="tooltip" title="{l s='If disabled, Advance Payment for the room type will be calculated By Global Advance payment settings.'}">
{l s='Apply Room Type Advance Payment Setting.'}
</span>
</label>
<div class="col-lg-9">
@@ -347,7 +347,7 @@ $(document).ready(function () {
</div>
</div>
<div class="help-block">
{l s='If final price of the stay type is less than advance payment amount for the customer then customer will pay the final(lesser) price of the stay type.'}
{l s='If final price of the room type is less than advance payment amount for the customer then customer will pay the final(lesser) price of the room type.'}
</div>
</div>
</div>
@@ -582,7 +582,7 @@ $(document).ready(function () {
</div>
</div>
<div class="form-group">
<label class="control-label col-lg-2" for="sp_price">{l s='Stay type price'}
<label class="control-label col-lg-2" for="sp_price">{l s='Room type price'}
{if $country_display_tax_label}
{l s='(tax excl.)'}
{/if}

4
admin/themes/default/template/controllers/products/seo.tpl
View File

@@ -30,7 +30,7 @@
<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="meta_title" type="default" multilang="true"}</span></div>
<label class="control-label col-lg-2" for="meta_title_{$id_lang}">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='Public title for the product\'s page, and for search engines. Leave blank to use the stay type name.'} {l s='The number of remaining characters is displayed to the left of the field.'}">
title="{l s='Public title for the product\'s page, and for search engines. Leave blank to use the room type name.'} {l s='The number of remaining characters is displayed to the left of the field.'}">
{l s='Meta title'}
</span>
</label>
@@ -79,7 +79,7 @@
<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="link_rewrite" type="seo_friendly_url" multilang="true"}</span></div>
<label class="control-label col-lg-2" for="link_rewrite_{$id_lang}">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='This is the human-readable URL, as generated from the stay type\'s name. You can change it if you want.'}">
title="{l s='This is the human-readable URL, as generated from the room type\'s name. You can change it if you want.'}">
{l s='Friendly URL:'}
</span>

2
admin/themes/default/template/controllers/products/serviceproduct.tpl
View File

@@ -183,7 +183,7 @@
</div>
{else}
<div class="alert alert-info">
{l s='No services are attached with this stay type'}
{l s='No services are attached with this room type'}
</div>
{/if}
</div>

4
admin/themes/default/template/controllers/search/helpers/view/view.tpl
View File

@@ -138,9 +138,9 @@ $(function() {
<div class="panel">
<h3>
{if $num_products == 1}
{l s='1 stay type'}
{l s='1 room type'}
{else}
{l s='%d stay types' sprintf=$num_products}
{l s='%d room types' sprintf=$num_products}
{/if}
</h3>
{$products}

2
admin/themes/default/template/search_form.tpl
View File

@@ -39,7 +39,7 @@
</li>
<li class="divider"></li>
<li class="search-book search-option">
<a href="#" data-value="{$QLO_SEARCH_TYPE_CATELOG}" data-placeholder="{l s='Stay Types, Service products...'}" data-icon="icon-book">
<a href="#" data-value="{$QLO_SEARCH_TYPE_CATELOG}" data-placeholder="{l s='Room Types, Service products...'}" data-icon="icon-book">
<i class="icon-book"></i> {l s='Catalog'}
</a>
</li>

2
classes/Product.php
View File

@@ -6891,7 +6891,7 @@ class ProductCore extends ObjectModel
$objProduct = new self($idProduct);
if (Validate::isLoadedObject($objProduct)) {
$bookingType = $objProduct->booking_method;
if ($bookingType !== null && $bookingType != HotelBookingDetail::PS_ROOM_UNIT_SELECTION_TYPE_DEFAULT) {
if ($bookingType !== null && $bookingType != 0) {
$result = (int) $bookingType;
if ($fallbackType === null) {
Cache::store($cache_key, $result);

4
controllers/admin/AdminCartRulesController.php
View File

@@ -250,8 +250,8 @@ class AdminCartRulesControllerCore extends AdminController
Media::addJsDef(
array(
'admin_cart_rule_tab_link' => $this->context->link->getAdminLink('AdminCartRules'),
'room_access_err' => $this->l('You can only select stay types which hotel(s) access is provided to this employee.'),
'room_rmv_txt' => $this->l('Unselect below stay types'),
'room_access_err' => $this->l('You can only select room types which hotel(s) access is provided to this employee.'),
'room_rmv_txt' => $this->l('Unselect below room types'),
)
);
$this->addJS(_PS_JS_DIR_.'admin/cart-rules.js');

2
controllers/admin/AdminCustomerThreadsController.php
View File

@@ -1004,7 +1004,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
if (Validate::isLoadedObject($product)) {
if ($product->booking_product) {
$content .= $this->l('Stay type:');
$content .= $this->l('Room type:');
} else {
$content .= $this->l('Product:');
}

2
controllers/admin/AdminDashboardController.php
View File

@@ -251,7 +251,7 @@ class AdminDashboardControllerCore extends AdminController
$objHotelInfo = new HotelBranchInformation();
$idsHotel = $objHotelInfo->getProfileAccessedHotels($this->context->employee->id_profile, 1, 1);
$hotelOptions = array(array('id_hotel' => false, 'hotel_name' => $this->l('All Hotels')));
$hotelOptions = array(array('id_hotel' => false, 'hotel_name' => $this->l('All Properties')));
foreach ($idsHotel as $idHotel) {
$objHotelBranchInfo = new HotelBranchInformation($idHotel, $this->context->language->id);
$hotelAddressInfo = HotelBranchInformation::getAddress($idHotel);

6
controllers/admin/AdminImagesController.php
View File

@@ -70,7 +70,7 @@ class AdminImagesControllerCore extends AdminController
'suffix' => ' px'
),
'products' => array(
'title' => $this->l('Stay Types/Products'),
'title' => $this->l('Room Types/Products'),
'align' => 'center',
'type' => 'bool',
'active' => 'products',
@@ -260,7 +260,7 @@ class AdminImagesControllerCore extends AdminController
),
array(
'type' => 'switch',
'label' => $this->l('Stay Types/Products'),
'label' => $this->l('Room Types/Products'),
'name' => 'products',
'required' => false,
'is_bool' => true,
@@ -502,7 +502,7 @@ class AdminImagesControllerCore extends AdminController
{
$types = array(
'categories' => $this->l('Categories'),
'products' => $this->l('Stay Types/Products'),
'products' => $this->l('Room Types/Products'),
'hotels' => $this->l('Hotels'),
// 'manufacturers' => $this->l('Manufacturers'),
// 'suppliers' => $this->l('Suppliers'),

16
controllers/admin/AdminImportController.php
View File

@@ -79,7 +79,7 @@ class AdminImportControllerCore extends AdminController
$this->bootstrap = true;
$this->entities = array(
$this->l('Hotels'),
$this->l('Stay Types'),
$this->l('Room Types'),
$this->l('Stays'),
$this->l('Categories'),
$this->l('Service Products'),
@@ -157,7 +157,7 @@ class AdminImportControllerCore extends AdminController
),
);
break;
case $this->entities[$this->l('Stay Types')]:
case $this->entities[$this->l('Room Types')]:
$this->required_fields = array('id_hotel', 'name');
self::$validators['image'] = array('AdminImportController', 'split');
@@ -175,7 +175,7 @@ class AdminImportControllerCore extends AdminController
'id_tax_rules_group' => array('label' => $this->l('Tax rule ID')),
'advance_payment' => array('label' => $this->l('Allow advance payment(0 = Yes, 1 = No)')),
'payment_type' => array(
'label' => $this->l('Stay type advance payment (0/1/2)'),
'label' => $this->l('Room type advance payment (0/1/2)'),
'help' => $this->l('0 = use global, 1 = Percentage, 2 = Fixed amount')
),
'payment_value' => array(
@@ -231,7 +231,7 @@ class AdminImportControllerCore extends AdminController
'no' => array('label' => $this->l('Ignore this column')),
'room_num' => array('label' => $this->l('Stay No *'),),
'floor' => array('label' => $this->l('Floor')),
'id_product' => array('label' => $this->l('Stay Type ID *')),
'id_product' => array('label' => $this->l('Room Type ID *')),
'id_status' => array(
'label' => $this->l('Stay status (1/2/3)'),
'help' => $this->l('1 = Active, 2 = Inactive, 3 = Temporarily Inactive')),
@@ -251,7 +251,7 @@ class AdminImportControllerCore extends AdminController
'active' => array('label' => $this->l('Active (0/1)')),
'name' => array('label' => $this->l('Name *')),
'category' => array('label' => $this->l('Categories (x,y,z...)')),
'id_room_types' => array('label' => $this->l('Associated stay types (x,y,z...) *')),
'id_room_types' => array('label' => $this->l('Associated room types (x,y,z...) *')),
'price' => array('label' => $this->l('Pre-tax retail price')),
'wholesale_price' => array('label' => $this->l('Pre-tax operating cost')),
'id_tax_rules_group' => array('label' => $this->l('Tax rule ID')),
@@ -2492,7 +2492,7 @@ class AdminImportControllerCore extends AdminController
}
}
} else {
$this->warnings[] = $this->l('Invalid stay type Id: ').$info['id_product'];
$this->warnings[] = $this->l('Invalid room type Id: ').$info['id_product'];
}
}
}
@@ -3317,7 +3317,7 @@ class AdminImportControllerCore extends AdminController
Tools::deleteDirectory($hotelImages, false);
$prodImages = $objHotelReservation->getLocalPath().'views/img/prod_imgs/';
Tools::deleteDirectory($prodImages, false);
case $this->entities[$this->l('Stay Types')]:
case $this->entities[$this->l('Room Types')]:
$images = Db::getInstance()->executeS('SELECT id_image FROM `'._DB_PREFIX_.'image` img
LEFT JOIN `'._DB_PREFIX_.'product` p ON p.id_product = img.id_product
WHERE p.booking_product=1');
@@ -3498,7 +3498,7 @@ class AdminImportControllerCore extends AdminController
$this->hotelImport();
$this->clearSmartyCache();
break;
case $this->entities[$import_type = $this->l('Stay Types')]:
case $this->entities[$import_type = $this->l('Room Types')]:
$this->roomTypeImport();
$this->clearSmartyCache();
break;

2
controllers/admin/AdminInvoicesController.php
View File

@@ -50,7 +50,7 @@ class AdminInvoicesControllerCore extends AdminController
'type' => 'bool'
),
'PS_PDF_IMG_INVOICE' => array(
'title' => $this->l('Enable stay type image'),
'title' => $this->l('Enable room type image'),
'hint' => $this->l('Adds an image before product name on the invoice'),
'validation' => 'isBool',
'cast' => 'intval',

4
controllers/admin/AdminOrderPreferencesController.php
View File

@@ -221,8 +221,8 @@ class AdminOrderPreferencesControllerCore extends AdminController
),
'PS_ALLOW_ADD_ALL_SERVICES_IN_BOOKING' => array(
'title' => $this->l('Allow to add all services in a booking'),
'hint' => $this->l('Enable to allow all services created to be added in a booking while adding or editing a booking. Disable to allow only attached services with stay type.'),
'desc' => $this->l('If disabled, only attached services with stay type will be available to be added to a booking.'),
'hint' => $this->l('Enable to allow all services created to be added in a booking while adding or editing a booking. Disable to allow only attached services with room type.'),
'desc' => $this->l('If disabled, only attached services with room type will be available to be added to a booking.'),
'cast' => 'intval',
'type' => 'bool'
),

10
controllers/admin/AdminOrdersController.php
View File

@@ -165,7 +165,7 @@ class AdminOrdersControllerCore extends AdminController
'visible_default' => true
),
'room_type_name' => array(
'title' => $this->l('Stay type'),
'title' => $this->l('Room type'),
'type' => 'select',
'filter_key' => 'hbd!id_product',
'list' => $this->roomTypesArray,
@@ -1442,7 +1442,7 @@ class AdminOrdersControllerCore extends AdminController
'title' => $this->l('Phone')
),
'room_types' => array(
'title' => $this->l('Stay Types')
'title' => $this->l('Room Types')
),
'rooms' => array(
'title' => $this->l('Stays')
@@ -1539,7 +1539,7 @@ class AdminOrdersControllerCore extends AdminController
} elseif (!in_array($idRoomToReallocate, array_column($availableRooms, 'id_room'))) {
$this->errors[] = $this->l('Selected stay is not available for reallocation.');
} elseif (!Validate::isFloat($priceDiff)) {
$this->errors[] = $this->l('Invalid price difference of the stay types.');
$this->errors[] = $this->l('Invalid price difference of the room types.');
}
} else {
$this->errors[] = $this->l('Selected stay is not available for reallocation.');
@@ -3231,7 +3231,7 @@ class AdminOrdersControllerCore extends AdminController
// if the current stock requires a warning
// if ($product['current_stock'] <= 0 && $display_out_of_stock_warning) {
// $this->displayWarning($this->l('This booked stay type is not found: ').' '.$product['product_name']);
// $this->displayWarning($this->l('This booked room type is not found: ').' '.$product['product_name']);
// }
if ($product['id_warehouse'] != 0) {
$warehouse = new Warehouse((int)$product['id_warehouse']);
@@ -8789,7 +8789,7 @@ class AdminOrdersControllerCore extends AdminController
$result['error'] = $this->l('Invalid booking information. Please try again.');
}
} else {
$result['error'] = $this->l('Selected stay type not found. Please try again.');
$result['error'] = $this->l('Selected room type not found. Please try again.');
}
$this->ajaxDie(json_encode($result));

2
controllers/admin/AdminPPreferencesController.php
View File

@@ -172,7 +172,7 @@ class AdminPPreferencesControllerCore extends AdminController
'type' => 'select',
'list' => array(
array('id' => HotelBookingDetail::SEARCH_EXACT_ROOM_TYPE_ALGO, 'name' => $this->l('Show room types satisfying required occupancy')),
array('id' => HotelBookingDetail::SEARCH_ALL_ROOM_TYPE_ALGO, 'name' => $this->l('Show all available stay types'))
array('id' => HotelBookingDetail::SEARCH_ALL_ROOM_TYPE_ALGO, 'name' => $this->l('Show all available room types'))
),
'identifier' => 'id',
'desc' => $this->l('This option is only for fully available stays. For partially available stay, always all possible rooms will be displayed.'),

2
controllers/admin/AdminPreferencesController.php
View File

@@ -187,7 +187,7 @@ class AdminPreferencesControllerCore extends AdminController
),
'PS_SHORT_DESC_LIMIT' => array(
'title' => $this->l('Short description Max Size'),
'hint' => $this->l('Set the maximum size of stay type, services and hotel short description (in characters).'),
'hint' => $this->l('Set the maximum size of room type, services and hotel short description (in characters).'),
'validation' => 'isUnsignedInt',
'cast' => 'intval',
'type' => 'text',

80
controllers/admin/AdminProductsController.php
View File

@@ -2387,11 +2387,11 @@ class AdminProductsControllerCore extends AdminController
// Categories
if ($this->isProductFieldUpdated('id_category_default') && (!Tools::isSubmit('categoryBox') || !count(Tools::getValue('categoryBox')))) {
$this->errors[] = $this->l('This stay type must be in at least one category.');
$this->errors[] = $this->l('This room type must be in at least one category.');
}
if ($this->isProductFieldUpdated('id_category_default') && (!is_array(Tools::getValue('categoryBox')) || !in_array(Tools::getValue('id_category_default'), Tools::getValue('categoryBox')))) {
$this->errors[] = $this->l('This stay type must be in the default category.');
$this->errors[] = $this->l('This room type must be in the default category.');
}
// Tags
@@ -2532,7 +2532,7 @@ class AdminProductsControllerCore extends AdminController
} else {
if (($object = $this->loadObject(true)) && $object->isAssociatedToShop()) {
if (!$object->booking_product) {
$this->errors[] = $this->l('Stay type not found.');
$this->errors[] = $this->l('Room type not found.');
return;
}
}
@@ -2661,17 +2661,17 @@ class AdminProductsControllerCore extends AdminController
}
$helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=best_selling_room_type';
$helper->tooltip = sprintf($this->l('Displays the best selling stay type based on the sales in the last %s day(s).', null, null, false), $nbDaysBestSelling);
$helper->tooltip = sprintf($this->l('Displays the best selling room type based on the sales in the last %s day(s).', null, null, false), $nbDaysBestSelling);
$this->kpis[] = $helper;
$helper = new HelperKpi();
$helper->id = 'box-disbled-room-types';
$helper->icon = 'icon-ban';
$helper->color = 'color2';
$helper->title = $this->l('Disabled Stay Types', null, null, false);
$helper->title = $this->l('Disabled Room Types', null, null, false);
$helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=disabled_room_types';
$helper->href = Context::getContext()->link->getAdminLink('AdminProducts').'&submitResetproduct&submitFilterproduct=1&productFilter_sa!active=0&submitFilterproduct=1';
$helper->tooltip = $this->l('The total number of stay types that are currently disabled.', null, null, false);
$helper->tooltip = $this->l('The total number of room types that are currently disabled.', null, null, false);
$this->kpis[] = $helper;
return parent::renderKpis();
@@ -2684,7 +2684,7 @@ class AdminProductsControllerCore extends AdminController
$this->addRowAction('duplicate');
$this->addRowAction('delete');
$this->tpl_list_vars['title'] = $this->l('Stay Types');
$this->tpl_list_vars['title'] = $this->l('Room Types');
$this->_new_list_header_design = true;
@@ -2762,7 +2762,7 @@ class AdminProductsControllerCore extends AdminController
protected function _displayDraftWarning($active)
{
$content = '<div class="warn draft" style="'.($active ? 'display:none' : '').'">
<span>'.$this->l('Your stay type will be saved as a draft.').'</span>
<span>'.$this->l('Your room type will be saved as a draft.').'</span>
<a href="#" class="btn btn-default pull-right" onclick="submitAddProductAndPreview()" ><i class="icon-external-link-sign"></i> '.$this->l('Save and preview').'</a>
<input type="hidden" name="fakeSubmitAddProductAndPreview" id="fakeSubmitAddProductAndPreview" />
</div>';
@@ -2774,8 +2774,8 @@ class AdminProductsControllerCore extends AdminController
if (empty($this->display)) {
$this->page_header_toolbar_btn['new_product'] = array(
'href' => self::$currentIndex.'&addproduct&token='.$this->token,
// 'desc' => $this->l('Add new stay type', null, null, false),
'desc' => $this->l('Add new stay type', null, null, false),
// 'desc' => $this->l('Add new room type', null, null, false),
'desc' => $this->l('Add new room type', null, null, false),
'icon' => 'process-icon-new'
);
}
@@ -2808,7 +2808,7 @@ class AdminProductsControllerCore extends AdminController
$this->page_header_toolbar_btn['stats'] = array(
'short' => $this->l('Statistics', null, null, false),
'href' => $this->context->link->getAdminLink('AdminStats').'&module=statsproduct&id_product='.(int)$product->id,
'desc' => $this->l('Stay Type Sales', null, null, false),
'desc' => $this->l('Room Type Sales', null, null, false),
);
}
@@ -2817,9 +2817,9 @@ class AdminProductsControllerCore extends AdminController
$this->page_header_toolbar_btn['delete'] = array(
'short' => $this->l('Delete', null, null, false),
'href' => $this->context->link->getAdminLink('AdminProducts').'&id_product='.(int)$product->id.'&deleteproduct',
'desc' => $this->l('Delete this stay type', null, null, false),
'desc' => $this->l('Delete this room type', null, null, false),
'confirm' => 1,
'js' => 'if (confirm(\''.$this->l('Delete stay type?', null, true, false).'\')){return true;}else{event.preventDefault();}'
'js' => 'if (confirm(\''.$this->l('Delete room type?', null, true, false).'\')){return true;}else{event.preventDefault();}'
);
}
}
@@ -2927,8 +2927,8 @@ class AdminProductsControllerCore extends AdminController
// add text for normal product and booking product
$this->tpl_form_vars['booking_product_text'] = array(
'name'=> $this->l('Stay Type'),
'name_title'=> $this->l('Write the name of the Stay Type for ex. Delux, Executive etc. Invalid characters <>;=#{}')
'name'=> $this->l('Room Type'),
'name_title'=> $this->l('Write the name of the Room Type for ex. Delux, Executive etc. Invalid characters <>;=#{}')
);
$this->tpl_form_vars['normal_product_text'] = array(
'name'=> $this->l('Name'),
@@ -3106,13 +3106,13 @@ class AdminProductsControllerCore extends AdminController
)
);
} else {
$this->displayWarning($this->l('Add Hotel Before configurate this stay type.'));
$this->displayWarning($this->l('Add Hotel Before configurate this room type.'));
}
} else {
$this->displayWarning($this->l('You must save the stay type in this shop before managing hotel configuration.'));
$this->displayWarning($this->l('You must save the room type in this shop before managing hotel configuration.'));
}
} else {
$this->displayWarning($this->l('You must save this stay type before managing stays.'));
$this->displayWarning($this->l('You must save this room type before managing stays.'));
}
$this->tpl_form_vars['custom_form'] = $data->fetch();
@@ -3245,7 +3245,7 @@ class AdminProductsControllerCore extends AdminController
));
}
} else {
$this->displayWarning($this->l('You must save this stay type before managing Service Products.'));
$this->displayWarning($this->l('You must save this room type before managing Service Products.'));
}
$this->tpl_form_vars['custom_form'] = $data->fetch();
@@ -3355,7 +3355,7 @@ class AdminProductsControllerCore extends AdminController
}
}
} else {
$this->errors[] = $this->l('Please save stay type details before saving service products.');
$this->errors[] = $this->l('Please save room type details before saving service products.');
}
}
@@ -3374,13 +3374,13 @@ class AdminProductsControllerCore extends AdminController
$smartyVars['roomTypeInfo'] = $roomTypeInfo;
}
} else {
$this->displayWarning($this->l('Add Hotel Before configurate this stay type.'));
$this->displayWarning($this->l('Add Hotel Before configurate this room type.'));
}
} else {
$this->displayWarning($this->l('You must save the stay type in this shop before managing occupancy.'));
$this->displayWarning($this->l('You must save the room type in this shop before managing occupancy.'));
}
} else {
$this->displayWarning($this->l('You must save this stay type before managing occupancy.'));
$this->displayWarning($this->l('You must save this room type before managing occupancy.'));
}
$smartyVars['currency'] = $this->context->currency;
$data->assign($smartyVars);
@@ -3471,16 +3471,16 @@ class AdminProductsControllerCore extends AdminController
$roomTypeInfo['restrictionDataRange'] = $objRoomTypeRestrictionDates->getRoomTypeLengthOfStayRestriction($product->id);
$smartyVars['roomTypeInfo'] = $roomTypeInfo;
} else {
$this->displayWarning($this->l('No hotel is attached to this stay type.'));
$this->displayWarning($this->l('No hotel is attached to this room type.'));
}
} else {
$this->displayWarning($this->l('Stay type information is missing.'));
$this->displayWarning($this->l('Room type information is missing.'));
}
} else {
$this->displayWarning($this->l('You must save stay type before managing length of stay.'));
$this->displayWarning($this->l('You must save room type before managing length of stay.'));
}
} else {
$this->displayWarning($this->l('You must save stay type before managing length of stay.'));
$this->displayWarning($this->l('You must save room type before managing length of stay.'));
}
$smartyVars['product'] = $product;
@@ -3771,7 +3771,7 @@ class AdminProductsControllerCore extends AdminController
'idDefaultcurrency' => $objCurrency->id,
));
} else {
$this->displayWarning($this->l('You must save this stay type before managing additional facilities.'));
$this->displayWarning($this->l('You must save this room type before managing additional facilities.'));
}
$this->tpl_form_vars['custom_form'] = $data->fetch();
@@ -3947,7 +3947,7 @@ class AdminProductsControllerCore extends AdminController
'is_shop_context' => Shop::getContext() == Shop::CONTEXT_SHOP
));
} else {
$this->displayWarning($this->l('You must save this stay type before updating associations.'));
$this->displayWarning($this->l('You must save this room type before updating associations.'));
}
$this->tpl_form_vars['custom_form'] = $data->fetch();
@@ -4008,7 +4008,7 @@ class AdminProductsControllerCore extends AdminController
// get hotel address for this room type
$address_infos = Address::getCountryAndState(Cart::getIdAddressForTaxCalculation($obj->id));
} else {
$this->displayWarning($this->l('You must save this stay type before adding specific pricing'));
$this->displayWarning($this->l('You must save this room type before adding specific pricing'));
$product->id_tax_rules_group = (int)Product::getIdTaxRulesGroupMostUsed();
$data->assign('ecotax_tax_excl', 0);
}
@@ -4768,10 +4768,10 @@ class AdminProductsControllerCore extends AdminController
$data->assign('imageType', ImageType::getFormatedName('small'));
}
} else {
$this->displayWarning($this->l('You must save the stay type in this shop before adding images.'));
$this->displayWarning($this->l('You must save the room type in this shop before adding images.'));
}
} else {
$this->displayWarning($this->l('You must save this stay type before adding images.'));
$this->displayWarning($this->l('You must save this room type before adding images.'));
}
$this->tpl_form_vars['custom_form'] = $data->fetch();
@@ -4832,10 +4832,10 @@ class AdminProductsControllerCore extends AdminController
$data->assign('link', $this->context->link);
$data->assign('default_form_language', $this->default_form_language);
} else {
$this->displayWarning($this->l('You must save the stay type in this shop before adding features.'));
$this->displayWarning($this->l('You must save the room type in this shop before adding features.'));
}
} else {
$this->displayWarning($this->l('You must save this stay type before adding features.'));
$this->displayWarning($this->l('You must save this room type before adding features.'));
}
}
$this->tpl_form_vars['custom_form'] = $data->fetch();
@@ -4913,8 +4913,8 @@ class AdminProductsControllerCore extends AdminController
&& ($product->pack_stock_type == 2 || $product->pack_stock_type == 1 ||
($product->pack_stock_type == 3 && (Configuration::get('PS_PACK_STOCK_TYPE') == 1 || Configuration::get('PS_PACK_STOCK_TYPE') == 2))))) {
die(json_encode(array('error' => $this->l('You cannot use advanced stock management for this pack because').'<br />'.
$this->l('- advanced stock management is not enabled for these stay types').'<br />'.
$this->l('- you have chosen to decrement stay types quantities.'))));
$this->l('- advanced stock management is not enabled for these room types').'<br />'.
$this->l('- you have chosen to decrement room types quantities.'))));
}
StockAvailable::setProductDependsOnStock($product->id, (int)Tools::getValue('value'));
@@ -4932,7 +4932,7 @@ class AdminProductsControllerCore extends AdminController
if ($product->depends_on_stock && !Pack::allUsesAdvancedStockManagement($product->id) && ((int)$value == 1
|| (int)$value == 2 || ((int)$value == 3 && (Configuration::get('PS_PACK_STOCK_TYPE') == 1 || Configuration::get('PS_PACK_STOCK_TYPE') == 2)))) {
die(json_encode(array('error' => $this->l('You cannot use this stock management option because:').'<br />'.
$this->l('- advanced stock management is not enabled for these stay types').'<br />'.
$this->l('- advanced stock management is not enabled for these room types').'<br />'.
$this->l('- advanced stock management is enabled for the pack'))));
}
@@ -4955,7 +4955,7 @@ class AdminProductsControllerCore extends AdminController
die(json_encode(array('error' => $this->l('Undefined value'))));
}
if (Tools::getValue('id_product_attribute') === false) {
die(json_encode(array('error' => $this->l('Undefined id stay type attribute'))));
die(json_encode(array('error' => $this->l('Undefined id room type attribute'))));
}
StockAvailable::setQuantity($product->id, (int)Tools::getValue('id_product_attribute'), (int)Tools::getValue('value'));
@@ -5031,7 +5031,7 @@ class AdminProductsControllerCore extends AdminController
'Consider changing the default category.' => $this->l('Consider changing the default category.'),
'ID' => $this->l('ID'),
'Name' => $this->l('Name'),
'Mark all checkbox(es) of categories in which stay type is to appear' => $this->l('Mark the checkbox of each categories in which this stay type will appear.')
'Mark all checkbox(es) of categories in which room type is to appear' => $this->l('Mark the checkbox of each categories in which this room type will appear.')
);
return $trad[$key];
}
@@ -5039,7 +5039,7 @@ class AdminProductsControllerCore extends AdminController
protected function _displayUnavailableProductWarning()
{
$content = '<div class="alert">
<span>'.$this->l('Your stay type will be saved as a draft.').'</span>
<span>'.$this->l('Your room type will be saved as a draft.').'</span>
<a href="#" class="btn btn-default pull-right" onclick="submitAddProductAndPreview()" ><i class="icon-external-link-sign"></i> '.$this->l('Save and preview').'</a>
<input type="hidden" name="fakeSubmitAddProductAndPreview" id="fakeSubmitAddProductAndPreview" />
</div>';

43
controllers/admin/AdminRoomTypeSellingObjectsController.php
View File

@@ -31,7 +31,7 @@ class AdminRoomTypeSellingObjectsController extends AdminController
$this->identifier = 'id_room_type_selling_object';
$this->lang = true;
$this->context = Context::getContext();
$this->toolbar_title = $this->l('Stay Type Selling Objects');
$this->toolbar_title = $this->l('Room Type Selling Objects');
parent::__construct();
@@ -86,7 +86,7 @@ class AdminRoomTypeSellingObjectsController extends AdminController
$this->fields_form = array(
'legend' => array(
'title' => $this->l('Stay Type Selling Object'),
'title' => $this->l('Room Type Selling Object'),
'icon' => 'icon-tags',
),
'input' => array(
@@ -96,13 +96,14 @@ class AdminRoomTypeSellingObjectsController extends AdminController
'name' => 'name',
'lang' => true,
'required' => true,
'hint' => $this->l('Displayed name for this stay type selling object.'),
'hint' => $this->l('Displayed name for this room type selling object.'),
),
array(
'type' => 'switch',
'label' => $this->l('Status'),
'label' => $this->l('Enabled'),
'name' => 'active',
'is_bool' => true,
'default_value' => 1,
'values' => array(
array(
'id' => 'active_on',
@@ -124,4 +125,38 @@ class AdminRoomTypeSellingObjectsController extends AdminController
return parent::renderForm();
}
public function postProcess()
{
if (Tools::isSubmit('submitAdd'.$this->table)) {
$languages = Language::getLanguages(false);
$defaultLangId = Configuration::get('PS_LANG_DEFAULT');
$objDefaultLanguage = Language::getLanguage((int) $defaultLangId);
$idSellingObject = Tools::getValue($this->identifier);
if (!trim(Tools::getValue('name_'.$defaultLangId))) {
$this->errors[] = $this->l('Name is required at least in ').$objDefaultLanguage['name'];
} else {
foreach ($languages as $lang) {
if (trim(Tools::getValue('name_'.$lang['id_lang']))) {
if (!Validate::isGenericName(Tools::getValue('name_'.$lang['id_lang']))) {
$this->errors[] = $this->l('Invalid Name in ').$lang['name'];
}
}
}
}
if ($idSellingObject) {
$this->display = 'edit';
} else {
$this->display = 'add';
}
if (!$this->errors) {
parent::postProcess();
}
} else {
parent::postProcess();
}
}
}

4
mails/en/booking_extra_demands.tpl
View File

@@ -5,7 +5,7 @@
<th colspan="3" class="table-caption">{l s='Stay Extra Demands Detail'}</th>
</tr>
<tr>
<th>{l s='Stay Type'}</th>
<th>{l s='Room Type'}</th>
<th>{l s='Name'}</th>
<th>{l s='Total'} <br /> {l s='(Tax excl.)'}</th>
</tr>
@@ -62,7 +62,7 @@
<th colspan="4" class="table-caption">{l s='Stays Services Detail'}</th>
</tr>
<tr>
<th>{l s='Stay Type'}</th>
<th>{l s='Room Type'}</th>
<th>{l s='Name'}</th>
<th>{l s='Qty'}</th>
<th>{l s='Total'}</th>

2
mails/en/booking_extra_demands.txt
View File

@@ -1,6 +1,6 @@
{if isset($list)}
{l s='Extra Demands Details'}
{l s='Stay Type'}
{l s='Room Type'}
{l s='Extra demand name'}
{l s='Total'} {l s='(Tax excl.)'}

4
mails/en/booking_extra_demands_text.tpl
View File

@@ -2,7 +2,7 @@
{l s='Stay Extra Demands Detail'}
{l s='Stay Type'}
{l s='Room Type'}
{l s='Name'}
{l s='Total'} {l s='(Tax excl.)'}
@@ -45,7 +45,7 @@
{l s='Stays Services Detail'}
{l s='Stay Type'}
{l s='Room Type'}
{l s='Name'}
{l s='Qty'}
{l s='Total'}

2
mails/en/bookings_refund_request_detail_admin.tpl
View File

@@ -6,7 +6,7 @@
</tr>
<tr>
<th>{l s="Stay Num"}</th>
<th>{l s="Stay Type"}</th>
<th>{l s="Room Type"}</th>
<th>{l s="Hotel"}</th>
<th>{l s="Duration"}</th>
</tr>

2
mails/en/bookings_refund_request_detail_admin_text.tpl
View File

@@ -2,7 +2,7 @@
{l s="Stay Num"}
{l s="Stay Type"}
{l s="Room Type"}
{l s="Hotel"}

2
mails/en/bookings_refund_request_detail_customer.tpl
View File

@@ -5,7 +5,7 @@
<th colspan="9" class="table-caption">{l s='Stays Bookings Detail'}</th>
</tr>
<tr>
<th>{l s="Stay Type"}</th>
<th>{l s="Room Type"}</th>
<th>{l s="Hotel"}</th>
<th>{l s="Stays Qty"}</th>
<th>{l s="Duration"}</th>

2
mails/en/bookings_refund_request_detail_customer_text.tpl
View File

@@ -3,7 +3,7 @@
{l s='Stays Bookings Detail'}
{l s="Stay Type"}
{l s="Room Type"}
{l s="Hotel"}

2
mails/en/order_refund_completed_admin.txt
View File

@@ -13,7 +13,7 @@ Transaction Id: {id_transaction}
Booking details
Stay Num
Stay Type
Room Type
Hotel
Duration
{refundBookingHtml}

2
mails/en/order_refund_completed_customer.txt
View File

@@ -12,7 +12,7 @@ Payment Mode: {payment_mode}
Transaction Id: {id_transaction}
Booking details
Stay Type
Room Type
Hotel
Num. Stays
Duration

2
mails/en/order_refund_denied_admin.txt
View File

@@ -11,7 +11,7 @@ Refund Status: {status_name}
Booking details
Stay Num
Stay Type
Room Type
Hotel
Duration

2
mails/en/order_refund_denied_customer.txt
View File

@@ -11,7 +11,7 @@ Refund Status: {status_name}
Booking details
Stay Type
Room Type
Hotel
Num. Stays
Duration

2
mails/en/order_refund_pending_admin.txt
View File

@@ -12,7 +12,7 @@ Cancelation Reason: {cancelation_reason}
Requested Booking Cancellations
Stay Num
Stay Type
Room Type
Hotel
Duration

2
mails/en/order_refund_pending_customer.txt
View File

@@ -10,7 +10,7 @@ Refund Status: {status_name}
Booking details
Stay Type
Room Type
Hotel
Num. Stays
Duration

2
modules/blockcart/blockcart.tpl
View File

@@ -228,7 +228,7 @@
<span id="layer_cart_product_quantity"></span>
</div>
<div>
<strong class="dark layer_cart_room_txt"><span class="layer_cart_room_type_cost_label">{l s='Stay type cost' mod='blockcart'}</span> &nbsp;-&nbsp;</strong>
<strong class="dark layer_cart_room_txt"><span class="layer_cart_room_type_cost_label">{l s='Room type cost' mod='blockcart'}</span> &nbsp;-&nbsp;</strong>
<strong class="dark layer_cart_product_txt">{l s='Total' mod='blockcart'} &nbsp;-&nbsp;</strong>
<span id="layer_cart_product_price"></span>
</div>

18
modules/dashguestcycle/dashguestcycle.php
View File

@@ -140,9 +140,9 @@ class DashGuestCycle extends Module
{
$header = array(
'name' => array('title' => $this->l('Customer Name'), 'class' => 'text-left'),
'room_num' => array('title' => $this->l('Room No.'), 'class' => 'text-center'),
'room_num' => array('title' => $this->l('Stay No.'), 'class' => 'text-center'),
'room_type' => array('title' => $this->l('Room Type'), 'class' => 'text-left'),
'hotel' => array('title' => $this->l('Hotel'), 'class' => 'text-left'),
'hotel' => array('title' => $this->l('Property'), 'class' => 'text-left'),
'guests' => array('title' => $this->l('Guests'), 'class' => 'text-center'),
'check_out' => array('title' => $this->l('Check-out (LOS)'), 'class' => 'text-left'),
'order_id' => array('title' => $this->l('Order ID'), 'class' => 'text-center'),
@@ -200,9 +200,9 @@ class DashGuestCycle extends Module
{
$header = array(
'name' => array('title' => $this->l('Customer Name'), 'class' => 'text-left'),
'room_num' => array('title' => $this->l('Room No.'), 'class' => 'text-center'),
'room_num' => array('title' => $this->l('Stay No.'), 'class' => 'text-center'),
'room_type' => array('title' => $this->l('Room Type'), 'class' => 'text-left'),
'hotel' => array('title' => $this->l('Hotel'), 'class' => 'text-left'),
'hotel' => array('title' => $this->l('Property'), 'class' => 'text-left'),
'guests' => array('title' => $this->l('Guests'), 'class' => 'text-center'),
'check_in' => array('title' => $this->l('Check-in (LOS)'), 'class' => 'text-left'),
'order_id' => array('title' => $this->l('Order ID'), 'class' => 'text-center'),
@@ -260,9 +260,9 @@ class DashGuestCycle extends Module
{
$header = array(
'name' => array('title' => $this->l('Customer Name'), 'class' => 'text-left'),
'room_num' => array('title' => $this->l('Room No.'), 'class' => 'text-center'),
'room_num' => array('title' => $this->l('Stay No.'), 'class' => 'text-center'),
'room_type' => array('title' => $this->l('Room Type'), 'class' => 'text-left'),
'hotel' => array('title' => $this->l('Hotel'), 'class' => 'text-left'),
'hotel' => array('title' => $this->l('Property'), 'class' => 'text-left'),
'guests' => array('title' => $this->l('Guests'), 'class' => 'text-center'),
'check_in' => array('title' => $this->l('Check-in'), 'class' => 'text-left'),
'check_out' => array('title' => $this->l('Check-out (LOS)'), 'class' => 'text-left'),
@@ -326,7 +326,7 @@ class DashGuestCycle extends Module
$header = array(
'order_id' => array('title' => $this->l('Order ID'), 'class' => 'text-center'),
'name' => array('title' => $this->l('Customer Name'), 'class' => 'text-left'),
'hotel' => array('title' => $this->l('Hotel'), 'class' => 'text-left'),
'hotel' => array('title' => $this->l('Property'), 'class' => 'text-left'),
'total' => array('title' => $this->l('Total Stays'), 'class' => 'text-center'),
'guests' => array('title' => $this->l('Guests'), 'class' => 'text-center'),
'order_total' => array('title' => $this->l('Order Total'), 'class' => 'text-right'),
@@ -388,9 +388,9 @@ class DashGuestCycle extends Module
$header = array(
'request_id' => array('title' => $this->l('Request ID'), 'class' => 'text-center'),
'name' => array('title' => $this->l('Customer Name'), 'class' => 'text-left'),
'room_num' => array('title' => $this->l('Room No.'), 'class' => 'text-center'),
'room_num' => array('title' => $this->l('Stay No.'), 'class' => 'text-center'),
'room_type' => array('title' => $this->l('Room Type'), 'class' => 'text-left'),
'hotel' => array('title' => $this->l('Hotel'), 'class' => 'text-left'),
'hotel' => array('title' => $this->l('Property'), 'class' => 'text-left'),
'guests' => array('title' => $this->l('Guests'), 'class' => 'text-center'),
'check_in' => array('title' => $this->l('Check-in'), 'class' => 'text-left'),
'check_out' => array('title' => $this->l('Check-out'), 'class' => 'text-left'),

34
modules/dashinsights/dashinsights.php
View File

@@ -60,7 +60,7 @@ class DashInsights extends Module
Media::addJsDef(array(
'hotel_txt' => $this->l('Hotel'),
'nights_booked_txt' => $this->l('Nights Booked'),
'room_booked_txt' => $this->l('Rooms Booked'),
'room_booked_txt' => $this->l('Stays Booked'),
'length_of_stay_txt' => $this->l('Length Of Stay'),
'total_nights_booked_txt' => $this->l('Total Nights Booked'),
'date_txt' => $this->l('Date'),
@@ -127,7 +127,7 @@ class DashInsights extends Module
$addressInfo = HotelBranchInformation::getAddress($idHotel, $this->context->language->id);
$panelsLabel = sprintf('(%s, %s)', $objHotelBranchInformation->hotel_name, $addressInfo['city']);
} else {
$panelsLabel = $this->l('(All Hotels)');
$panelsLabel = $this->l('(All Properties)');
}
$return = array(
@@ -145,13 +145,13 @@ class DashInsights extends Module
'chart_type' => 'multibar_chart_dotw_dashinsights',
'data' => $daysOfTheWeekData,
'date_format' => $this->context->language->date_format_lite,
'axis_labels' => array('y' => $this->l('Rooms occupied')),
'axis_labels' => array('y' => $this->l('Stays occupied')),
),
'dashinsights_multibar_chart2' => array(
'chart_type' => 'multibar_chart_los_dashinsights',
'data' => $lengthOfStayData,
'date_format' => $this->context->language->date_format_lite,
'axis_labels' => array('x' => $this->l('Length of stay'), 'y' => $this->l('Rooms occupied')),
'axis_labels' => array('x' => $this->l('Length of stay'), 'y' => $this->l('Stays occupied')),
),
),
);
@@ -164,10 +164,10 @@ class DashInsights extends Module
$seriesWiseRoomNights = array();
if (Configuration::get('PS_DASHBOARD_SIMULATION')) {
// set room nights demo data
if ($idHotel == 0) { // if 'All Hotels' is selected
if ($idHotel == 0) { // if 'All Properties' is selected
$allHotelSeriesInfo = array(
'data' => array(),
'label' => $this->l('All Hotels'),
'label' => $this->l('All Properties'),
);
foreach ($this->discreteDates as $discreteDate) {
@@ -207,11 +207,11 @@ class DashInsights extends Module
);
}
} else {
if ($idHotel == 0) { // if 'All Hotels' is selected
if ($idHotel == 0) { // if 'All Properties' is selected
$idsHotel = $this->accessibleIdsHotel;
$allHotelSeriesInfo = array(
'data' => AdminStatsController::getRoomNightsData($dateFrom, $dateTo, $idsHotel),
'label' => $this->l('All Hotels'),
'label' => $this->l('All Properties'),
);
$seriesWiseRoomNights[] = $allHotelSeriesInfo;
@@ -271,10 +271,10 @@ class DashInsights extends Module
$seriesWiseDaysOfTheWeek = array();
if (Configuration::get('PS_DASHBOARD_SIMULATION')) {
// set room nights demo data
if ($idHotel == 0) { // if 'All Hotels' is selected
if ($idHotel == 0) { // if 'All Properties' is selected
$allHotelSeriesInfo = array(
'data' => array(),
'label' => $this->l('All Hotels'),
'label' => $this->l('All Properties'),
);
// 1 = SUN
@@ -316,11 +316,11 @@ class DashInsights extends Module
);
}
} else {
if ($idHotel == 0) { // if 'All Hotels' is selected
if ($idHotel == 0) { // if 'All Properties' is selected
$idsHotel = $this->accessibleIdsHotel;
$allHotelSeriesInfo = array(
'data' => AdminStatsController::getOccupiedRoomsForDaysOfTheWeek($dateFrom, $dateTo, $idsHotel),
'label' => $this->l('All Hotels'),
'label' => $this->l('All Properties'),
);
$seriesWiseDaysOfTheWeek[] = $allHotelSeriesInfo;
@@ -348,7 +348,7 @@ class DashInsights extends Module
$averageDaysOfTheWeekData = AdminStatsController::getOccupiedRoomsForDaysOfTheWeek($dateFrom, $dateTo, $idsHotel, true, true);
$averageSeriesInfo = array(
'data' => $averageDaysOfTheWeekData,
'label' => $this->l('Other Hotels Average'),
'label' => $this->l('Other Properties Average'),
);
$seriesWiseDaysOfTheWeek[] = $averageSeriesInfo;
@@ -409,10 +409,10 @@ class DashInsights extends Module
if (Configuration::get('PS_DASHBOARD_SIMULATION')) {
// set room nights demo data
if ($idHotel == 0) { // if 'All Hotels' is selected
if ($idHotel == 0) { // if 'All Properties' is selected
$allHotelSeriesInfo = array(
'data' => array(),
'label' => $this->l('All Hotels'),
'label' => $this->l('All Properties'),
);
$roomsOccupied = array(
@@ -486,11 +486,11 @@ class DashInsights extends Module
);
}
} else {
if ($idHotel == 0) { // if 'All Hotels' is selected
if ($idHotel == 0) { // if 'All Properties' is selected
$idsHotel = $this->accessibleIdsHotel;
$allHotelSeriesInfo = array(
'data' => AdminStatsController::getLengthOfStayInfo($day, $dateFrom, $dateTo, $idsHotel),
'label' => $this->l('All Hotels'),
'label' => $this->l('All Properties'),
);
$seriesWiseLengthOfStay[] = $allHotelSeriesInfo;

2
modules/dashinsights/views/templates/hook/dashboard-zone-two.tpl
View File

@@ -35,7 +35,7 @@
<section>
<div class="row">
<div class="col-md-12 col-lg-6">
<p class="chart-label">{l s='Room Nights' mod='dashinsights'}</p>
<p class="chart-label">{l s='Stay Nights' mod='dashinsights'}</p>
<div class="chart with-transitions insight-chart-wrap" id="dashinsights_room_nights">
<svg></svg>
</div>

4
modules/dashperformance/views/templates/hook/dashboard_zone_two.tpl
View File

@@ -75,7 +75,7 @@
<div class="col-xs-6 col-lg-3">
<div class="stat-box label-tooltip" data-toggle="tooltip" data-original-title="{l s='Revenue Per Available Room (RevPAR) is calculated by dividing total stays revenue by the total number of rooms in the period being measured.' mod='dashperformance'}" data-placement="top" style="background-color: #B6FFB6;">
<div class="title-wrapper">
<p>{l s='Revenue Per Available Room' mod='dashperformance'}</p>
<p>{l s='Revenue Per Available Stay' mod='dashperformance'}</p>
</div>
<div class="value-wrapper">
<span id="dp_revenue_per_available_room" style="color: #00B200;">--</span>
@@ -85,7 +85,7 @@
<div class="col-xs-6 col-lg-3">
<div class="stat-box label-tooltip" data-toggle="tooltip" data-original-title="{l s='Total Revenue Per Available Room (TrevPAR) measures the total revenue being generated per available room including additional facilities and service products.' mod='dashperformance'}" data-placement="top" style="background-color: #EBCDFF;">
<div class="title-wrapper">
<p>{l s='Total Revenue Per Available Room' mod='dashperformance'}</p>
<p>{l s='Total Revenue Per Available Stay' mod='dashperformance'}</p>
</div>
<div class="value-wrapper">
<span id="dp_total_revenue_per_available_room" style="color: #FF4036;">--</span>

2
modules/hotelreservationsystem/classes/HotelBookingDetail.php
View File

@@ -86,8 +86,6 @@ class HotelBookingDetail extends ObjectModel
const SEARCH_TYPE_OWS = 1;
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;

37
modules/hotelreservationsystem/controllers/admin/AdminHotelPropertyTypesController.php
View File

@@ -100,9 +100,10 @@ class AdminHotelPropertyTypesController extends ModuleAdminController
),
array(
'type' => 'switch',
'label' => $this->l('Status'),
'label' => $this->l('Enabled'),
'name' => 'active',
'is_bool' => true,
'default_value' => 1,
'values' => array(
array(
'id' => 'active_on',
@@ -124,4 +125,38 @@ class AdminHotelPropertyTypesController extends ModuleAdminController
return parent::renderForm();
}
public function postProcess()
{
if (Tools::isSubmit('submitAdd'.$this->table)) {
$languages = Language::getLanguages(false);
$defaultLangId = Configuration::get('PS_LANG_DEFAULT');
$objDefaultLanguage = Language::getLanguage((int) $defaultLangId);
$idPropertyType = Tools::getValue($this->identifier);
if (!trim(Tools::getValue('name_'.$defaultLangId))) {
$this->errors[] = $this->l('Name is required at least in ').$objDefaultLanguage['name'];
} else {
foreach ($languages as $lang) {
if (trim(Tools::getValue('name_'.$lang['id_lang']))) {
if (!Validate::isGenericName(Tools::getValue('name_'.$lang['id_lang']))) {
$this->errors[] = $this->l('Invalid Name in ').$lang['name'];
}
}
}
}
if ($idPropertyType) {
$this->display = 'edit';
} else {
$this->display = 'add';
}
if (!$this->errors) {
parent::postProcess();
}
} else {
parent::postProcess();
}
}
}

26
modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php
View File

@@ -41,8 +41,8 @@ class AdminHotelRoomsBookingController extends ModuleAdminController
parent::__construct();
$this->_conf[52] = $this->l('Room in the booking is successfully reallocated');
$this->_conf[53] = $this->l('Room in the booking is successfully swapped');
$this->_conf[52] = $this->l('Stay in the booking is successfully reallocated');
$this->_conf[53] = $this->l('Stay in the booking is successfully swapped');
}
public function init()
@@ -946,7 +946,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController
$modal = array(
'modal_id' => 'room-reallocation-modal',
'modal_class' => 'modal-md order_detail_modal',
'modal_title' => '<i class="icon icon-refresh"></i> &nbsp'.$this->l('Room Reallocation / Swap'),
'modal_title' => '<i class="icon icon-refresh"></i> &nbsp'.$this->l('Stay Reallocation / Swap'),
'modal_content' => $this->context->smarty->fetch('controllers/orders/modals/_room_reallocation.tpl'),
'modal_actions' => null,
);
@@ -994,14 +994,14 @@ class AdminHotelRoomsBookingController extends ModuleAdminController
'add_to_cart' => $this->l('Add To Cart', null, true),
'remove' => $this->l('Remove', null, true),
'noRoomTypeAvlTxt' => $this->l('No room type available.', null, true),
'slct_rm_err' => $this->l('Please select a room first.', null, true),
'slct_rm_err' => $this->l('Please select a stay first.', null, true),
'slct_rm_type_err' => $this->l('Please select a room type first.', null, true),
'product_added_cart_txt' => $this->l('Product added in cart', null, true),
'info_icon_path' => _MODULE_DIR_.$this->module->name.'/views/img/Slices/info-icon.svg',
'select_age_txt' => $this->l('Select age', null, true),
'under_1_age' => $this->l('Under 1', null, true),
'room_txt' => $this->l('Room', null, true),
'rooms_txt' => $this->l('Rooms', null, true),
'room_txt' => $this->l('Stay', null, true),
'rooms_txt' => $this->l('Stays', null, true),
'remove_txt' => $this->l('Remove', null, true),
'adult_txt' => $this->l('Adults', null, true),
'adults_txt' => $this->l('Adults', null, true),
@@ -1010,7 +1010,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController
'below_txt' => $this->l('Below', null, true),
'years_txt' => $this->l('years', null, true),
'all_children_txt' => $this->l('All Children', null, true),
'max_occupancy_reached_txt' => $this->l('Maximum room occupancy reached', null, true),
'max_occupancy_reached_txt' => $this->l('Maximum stay occupancy reached', null, true),
'max_adults_txt' => $this->l('Maximum adult occupancy reached', null, true),
'max_children_txt' => $this->l('Maximum children occupancy reached', null, true),
'no_children_allowed_txt' => $this->l('Only adults can be accommodated', null, true),
@@ -1018,13 +1018,13 @@ class AdminHotelRoomsBookingController extends ModuleAdminController
'PS_BACKDATE_ORDER_ALLOW' => $PS_BACKDATE_ORDER_ALLOW,
// 'check_calender_var' => $check_calender_var,
'txtSomeErr' => $this->l('Some error occurred. Please try again.', null, true),
'no_rm_avail_txt' => $this->l('No room available.', null, true),
'no_realloc_rm_avail_txt' => $this->l('No room available for reallocation.', null, true),
'no_rm_avail_txt' => $this->l('No stay available.', null, true),
'no_realloc_rm_avail_txt' => $this->l('No stay available for reallocation.', null, true),
'no_realloc_rm_type_avail_txt' => $this->l('No room type available for reallocation.', null, true),
'no_swap_rm_avail_txt' => $this->l('No room available for swap.', null, true),
'select_room_txt' => $this->l('Select room', null, true),
'added_room_success_txt' => $this->l('Room added to cart successfully', null, true),
'removed_room_success_txt' => $this->l('Room removed from cart successfully', null, true),
'no_swap_rm_avail_txt' => $this->l('No stay available for swap.', null, true),
'select_room_txt' => $this->l('Select stay', null, true),
'added_room_success_txt' => $this->l('Stay added to cart successfully', null, true),
'removed_room_success_txt' => $this->l('Stay removed from cart successfully', null, true),
);
if (Configuration::get('PS_BACKOFFICE_SEARCH_TYPE') == HotelBookingDetail::SEARCH_TYPE_OWS ) {
$jsVars['is_occupancy_wise_search'] = true;

2
modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-cart.tpl
View File

@@ -14,7 +14,7 @@
<thead class="cart-table-thead">
<tr>
<th class="text-center">{l s='Stay No.' mod='hotelreservationsystem'}</th>
<th class="text-center">{l s='Stay Type' mod='hotelreservationsystem'}</th>
<th class="text-center">{l s='Room Type' mod='hotelreservationsystem'}</th>
<th class="text-center">{l s='Duration' mod='hotelreservationsystem'}</th>
<th class="text-center">{l s='Amount (Tax excl.)' mod='hotelreservationsystem'}</th>
<th></th>

2
modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl
View File

@@ -143,7 +143,7 @@
<th></th>
{/if}
<th>{l s='Stay num' mod='hotelreservationsystem'}</th>
<th>{l s='Stay type' mod='hotelreservationsystem'}</th>
<th>{l s='Room type' mod='hotelreservationsystem'}</th>
<th>{l s='Property' mod='hotelreservationsystem'}</th>
<th>{l s='Duration' mod='hotelreservationsystem'}</th>
<th>{l s='Total cost (tax incl.)' mod='hotelreservationsystem'}</th>

2
modules/statscheckup/statscheckup.php
View File

@@ -234,7 +234,7 @@ class StatsCheckUp extends Module
'DESCRIPTIONS' => array('name' => $this->l('Descriptions'), 'text' => $this->l('chars (without HTML)')),
'IMAGES' => array('name' => $this->l('Images'), 'text' => $this->l('images')),
'ORDERS' => array('name' => $this->l('Orders'), 'text' => $this->l('orders / month')),
'TOTAL_ROOMS' => array('name' => $this->l('Total stays'), 'text' => $this->l('rooms')),
'TOTAL_ROOMS' => array('name' => $this->l('Total stays'), 'text' => $this->l('stays')),
);
$hotelsHtml = '

4
modules/statsproduct/statsproduct.php
View File

@@ -356,9 +356,9 @@ class StatsProduct extends ModuleGraph
if (Tools::getValue('export')) {
$this->_titles['main'][] = $this->l('Date');
}
$this->_titles['main'][] = $this->l('Room nights');
$this->_titles['main'][] = $this->l('Stay nights');
$this->_titles['main'][] = $this->l('Views (x100)');
$this->_titles['y'] = $this->l('Room nights, Views (x100)');
$this->_titles['y'] = $this->l('Stay nights, Views (x100)');
$this->_formats['y'] = 'd';
$this->query[0] = 'SELECT o.`date_add`, SUM(DATEDIFF(hbd.`date_to`, hbd.`date_from`)) AS total

2
modules/wkhotelroom/controllers/admin/AdminHotelRoomModuleSettingController.php
View File

@@ -223,7 +223,7 @@ class AdminHotelRoomModuleSettingController extends ModuleAdminController
$this->fields_form = array(
'legend' => array(
'title' => $this->l('Rooms Configuration'),
'title' => $this->l('Stays Configuration'),
'icon' => 'icon-globe'
),
'input' => array(

2
modules/wkroomsearchblock/views/templates/hook/searchForm.tpl
View File

@@ -88,7 +88,7 @@
<div class="dropdown">
<button class="form-control input-occupancy header-rmsearch-input {if isset($error) && $error == 1}error_border{/if}" type="button" data-toggle="dropdown" id="guest_occupancy">
<span class="pull-left">{if (isset($search_data['occupancy_adults']) && $search_data['occupancy_adults'])}{$search_data['occupancy_adults']} {if $search_data['occupancy_adults'] > 1}{l s='Adults' mod='wkroomsearchblock'}{else}{l s='Adult' mod='wkroomsearchblock'}{/if}, {if isset($search_data['occupancy_children']) && $search_data['occupancy_children']}{$search_data['occupancy_children']} {if $search_data['occupancy_children'] > 1}
{l s='Children' mod='wkroomsearchblock'}{else}{l s='Child' mod='wkroomsearchblock'}{/if}, {/if}{$search_data['occupancies']|count} {if $search_data['occupancies']|count > 1}{l s='Rooms' mod='wkroomsearchblock'}{else}{l s='Room' mod='wkroomsearchblock'}{/if}{else}{l s='1 Adult, 1 Room' mod='wkroomsearchblock'}{/if}</span>
{l s='Children' mod='wkroomsearchblock'}{else}{l s='Child' mod='wkroomsearchblock'}{/if}, {/if}{$search_data['occupancies']|count} {if $search_data['occupancies']|count > 1}{l s='Stays' mod='wkroomsearchblock'}{else}{l s='Stay' mod='wkroomsearchblock'}{/if}{else}{l s='1 Adult, 1 Stay' mod='wkroomsearchblock'}{/if}</span>
</button>
<div id="search_occupancy_wrapper" class="dropdown-menu">
<div id="occupancy_inner_wrapper">

8
modules/wkroomsearchblock/wkroomsearchblock.php
View File

@@ -41,8 +41,8 @@ class WkRoomSearchBlock extends Module
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('QloApps Room Search Panels');
$this->description = $this->l('Room search blocks on different pages to search rooms as per user travel parameters.');
$this->displayName = $this->l('QloApps Stay Search Panels');
$this->description = $this->l('Stay search blocks on different pages to search stays as per user travel parameters.');
$this->ps_versions_compliancy = array('min' => '1.6', 'max' => _PS_VERSION_);
}
@@ -80,8 +80,8 @@ class WkRoomSearchBlock extends Module
'select_htl_txt' => $this->l('Select Hotel', false, true),
'select_age_txt' => $this->l('Select age', false, true),
'under_1_age' => $this->l('Under 1', false, true),
'room_txt' => $this->l('Room', false, true),
'rooms_txt' => $this->l('Rooms', false, true),
'room_txt' => $this->l('Stay', false, true),
'rooms_txt' => $this->l('Stays', false, true),
'remove_txt' => $this->l('Remove', false, true),
'adult_txt' => $this->l('Adult', false, true),
'adults_txt' => $this->l('Adults', false, true),

4
pdf/invoice.extra-demands-tab.tpl
View File

@@ -30,7 +30,7 @@
<th colspan="4" class="header">{l s='Stay Additional Facilities Detail' pdf='true'}</th>
</tr>
<tr>
<th class="header-left small">{l s='Stay Type' pdf='true'}</th>
<th class="header-left small">{l s='Room Type' pdf='true'}</th>
<th class="header-left small">{l s='Name' pdf='true'}</th>
<th class="header-left small">{l s='Tax rate(s)' pdf='true'}</th>
<th class="header-left small">{l s='Total' pdf='true'} <br /> {l s='(Tax excl.)' pdf='true'}</th>
@@ -75,7 +75,7 @@
<th colspan="5" class="header">{l s='Stay Extra Services Detail' pdf='true'}</th>
</tr>
<tr>
<th class="header-left small">{l s='Stay Type' pdf='true'}</th>
<th class="header-left small">{l s='Room Type' pdf='true'}</th>
<th class="header-left small">{l s='Name' pdf='true'}</th>
<th class="header small">{l s='Tax rate(s)' pdf='true'}</th>
<th class="header small">{l s='Qty' pdf='true'}</th>

2
pdf/order-slip.product-tab.tpl
View File

@@ -30,7 +30,7 @@
<th colspan="5" class="header">{l s='Stay Bookings Detail' pdf='true'}</th>
</tr>
<tr>
<th class="product header">{l s='Stay Type / Reference' pdf='true'}</th>
<th class="product header">{l s='Room Type / Reference' pdf='true'}</th>
<th class="product header">{l s='Hotel' pdf='true'}</th>
<th class="product header">{l s='Duration' pdf='true'}</th>
<th class="product header">{l s='Num stays' pdf='true'}</th>

2
themes/hotel-reservation-theme/_partials/room_type_list.tpl
View File

@@ -152,7 +152,7 @@
{/foreach}
{else}
<div class="noRoomsAvailAlert">
<span>{l s='No stay available for this hotel!'}</span>
<span>{l s='No stay available for this property!'}</span>
</div>
{/if}

2
themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl
View File

@@ -228,7 +228,7 @@
<span id="layer_cart_product_quantity"></span>
</div>
<div>
<strong class="dark layer_cart_room_txt"><span class="layer_cart_room_type_cost_label">{l s='Stay type cost' mod='blockcart'}</span> &nbsp;-&nbsp;</strong>
<strong class="dark layer_cart_room_txt"><span class="layer_cart_room_type_cost_label">{l s='Room type cost' mod='blockcart'}</span> &nbsp;-&nbsp;</strong>
<strong class="dark layer_cart_product_txt">{l s='Total' mod='blockcart'} &nbsp;-&nbsp;</strong>
<span id="layer_cart_product_price"></span>
</div>

6
themes/hotel-reservation-theme/order-detail.tpl
View File

@@ -577,12 +577,12 @@
{block name='order_detail_add_order_messages_form'}
<form action="{$link->getPageLink('order-detail', true)|escape:'html':'UTF-8'}" method="post" class="std" id="sendOrderMessage">
<div class="form-group select-room-type">
<label for="id_product">{l s='Stay Type'}{if $service_products_formatted}/{l s='Product'}{/if}</label>
<label for="id_product">{l s='Room Type'}{if $service_products_formatted}/{l s='Product'}{/if}</label>
<p class="card-subheader text-muted">
{if $service_products_formatted}
{l s='To add a comment about a stay type/product, please select one first.'}
{l s='To add a comment about a room type/product, please select one first.'}
{else}
{l s='To add a comment about a stay type, please select one first.'}
{l s='To add a comment about a room type, please select one first.'}
{/if}
</p>
<select name="id_product" class="form-control">

2
themes/hotel-reservation-theme/order-return.tpl
View File

@@ -60,7 +60,7 @@
<table class="table table-bordered">
<tr>
<th>{l s='Stays'}</th>
<th>{l s='Stay type'}</th>
<th>{l s='Room type'}</th>
<th>{l s='Property Name'}</th>
<th>{l s='Duration'}</th>
<th>{l s='Total stays price (tax incl.)'}</th>

4
themes/hotel-reservation-theme/product.tpl
View File

@@ -49,7 +49,7 @@
{/if} --><!-- by webkul -->
{if isset($adminActionDisplay) && $adminActionDisplay}
<div id="admin-action" class="container">
<p class="alert alert-info">{l s='This stay type is not visible to your customers.'}
<p class="alert alert-info">{l s='This room type is not visible to your customers.'}
<input type="hidden" id="admin-action-product-id" value="{$product->id}" />
<a id="publish_button" class="btn btn-default button button-small" href="#">
<span>{l s='Publish'}</span>
@@ -748,7 +748,7 @@
{else}
<div class="bootstrap">
<div class="alert alert-warning">
{l s='This stay type has not enough information. Please save information of related hotel and other required stay information for the booking of this stay type.'}
{l s='This room type has not enough information. Please save information of related hotel and other required stay information for the booking of this room type.'}
</div>
</div>
{/if}