Added: Add per-room booking methods, standardize selling object type across order pages, and implement default property & room type values

admin/themes/default/template/controllers/access/helpers/form/form.tpl

@@ -261,11 +261,11 @@
 				<div class="col-lg-6">
 					{if isset($hotels) && $hotels}
 						<div class="panel">
-							<h3>{l s='Hotel Permissions'}</h3>
+							<h3>{l s='Property Permissions'}</h3>
 							<table class="table" id="table_hotel_{$profile.id_profile}">
 								<thead>
 									<tr>
-										<th>{l s='Hotel'}</th>
+										<th>{l s='Property'}</th>
 										<th>
 											<input type="checkbox"{if $access_edit == 1} class="changeHotelAccess" data-rel="-1||all||{$profile.id_profile}"{else} disabled="disabled"{/if}/>
 											{l s='All'}

admin/themes/default/template/controllers/carts/helpers/view/view.tpl

@@ -85,7 +85,7 @@
 					<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>
-					<th><span class="title_box">{l s='Room price'}</span></th>
+					<th><span class="title_box">{l s='Stay price'}</span></th>
 					<th><span class="title_box">{l s='Extra services'}</span></th>
 					<th class="text-right"><span class="title_box">{l s='Total'}</span></th>
 				</tr>
@@ -104,7 +104,7 @@
 						<td>{dateFormat date=$room['date_from'] full=$is_full_date} - {dateFormat date=$room['date_to'] full=$is_full_date}</td>
 						<td>
 							<span>
-								{if $room['adults']}{$room['adults']}{/if} {if $room['adults'] > 1}{l s='Adults'}{else}{l s='Adult'}{/if}{if {$room['children']}}, {$room['children']} {if $room['children'] > 1}{l s='Children'}{else}{l s='Child'}{/if}{/if}
+								{if $stay['adults']}{$stay['adults']}{/if} {if $stay['adults'] > 1}{l s='Adults'}{else}{l s='Adult'}{/if}{if {$stay['children']}}, {$stay['children']} {if $stay['children'] > 1}{l s='Children'}{else}{l s='Child'}{/if}{/if}
 							</span>
 						</td>
 						<td>{displayWtPriceWithCurrency price=$room['feature_price_tax_excl'] currency=$currency}</td>
@@ -134,10 +134,10 @@
 									</button>
 									<ul class="nav nav-tabs" role="tablist">
 										{if isset($room['selected_demands']) && $room['selected_demands']}
-											<li role="presentation" class="active"><a href="#room_type_demands_desc_{$room['id']}" aria-controls="facilities" role="tab" data-toggle="tab">{l s='Facilities'}</a></li>
+											<li role="presentation" class="active"><a href="#room_type_demands_desc_{$stay['id']}" aria-controls="facilities" role="tab" data-toggle="tab">{l s='Facilities'}</a></li>
 										{/if}
 										{if isset($room['selected_services']) && $room['selected_services']}
-											<li role="presentation" {if !isset($room['selected_demands']) || !$room['selected_demands']}class="active"{/if}><a href="#room_type_service_product_desc_{$room['id']}" aria-controls="services" role="tab" data-toggle="tab">{l s='Services'}</a></li>
+											<li role="presentation" {if !isset($stay['selected_demands']) || !$stay['selected_demands']}class="active"{/if}><a href="#room_type_service_product_desc_{$stay['id']}" aria-controls="services" role="tab" data-toggle="tab">{l s='Services'}</a></li>
 										{/if}
 									</ul>
 									<div class="tab-content panel">

admin/themes/default/template/controllers/import/helpers/form/form.tpl

@@ -318,7 +318,7 @@
 					{l s='Sample Room Types file'}
 				</a>
 				<a class="list-group-item _blank" href="../docs/csv_import/rooms_import.csv">
-					{l s='Sample Rooms file'}
+					{l s='Sample Stays file'}
 				</a>
 				<a class="list-group-item _blank" href="../docs/csv_import/service_products_import.csv">
 					{l s='Sample Service Products file'}

admin/themes/default/template/controllers/normal_products/features.tpl

@@ -50,7 +50,7 @@
 				<td>{$available_feature.name}</td>
 				<td>
 					<input type="hidden" id="feature_{$available_feature.id_feature}_value" name="feature_{$available_feature.id_feature}_value" value="{$value.id_feature_value}">
-					<img class="img img-responsive" width="15px" src="{$base_url}img/rf/{$value.value}" title="Room image" />
+					<img class="img img-responsive" width="15px" src="{$base_url}img/rf/{$value.value}" title="Stay image" />
 				</td>
 				{/foreach}
 				<!--<td>

admin/themes/default/template/controllers/normal_products/informations.tpl

@@ -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,7 +261,7 @@
 	<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 room type and hotels for which this service will be available.'}">
+			<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>
@@ -295,13 +295,13 @@
 	<div id="price_addition_type_container" {if !$product->auto_add_to_cart || !$product->isAssociatedToShop()}style="display:none;"{/if}>
 		<div class="form-group">
 			<label class="control-label col-lg-3" for="selling_preference_type">
-				<span class="label-tooltip" data-toggle="tooltip" title="{l s='Select whether price will be added in the base room price or as Convenience Fee'}">
+				<span class="label-tooltip" data-toggle="tooltip" title="{l s='Select whether price will be added in the base stay price or as Convenience Fee'}">
 					{l s='Price display preference'}
 				<span>
 			</label>
 			<div class="col-lg-4">
 				<select name="price_addition_type" id="price_addition_type">
-					<option value="{Product::PRICE_ADDITION_TYPE_WITH_ROOM}" {if $product->price_addition_type == Product::PRICE_ADDITION_TYPE_WITH_ROOM}selected="selected"{/if} >{l s='Add price in room price'}</option>
+					<option value="{Product::PRICE_ADDITION_TYPE_WITH_ROOM}" {if $product->price_addition_type == Product::PRICE_ADDITION_TYPE_WITH_ROOM}selected="selected"{/if} >{l s='Add price in stay price'}</option>
 					<option value="{Product::PRICE_ADDITION_TYPE_INDEPENDENT}" {if $product->price_addition_type == Product::PRICE_ADDITION_TYPE_INDEPENDENT}selected="selected"{/if} >{l s='Add price as convenience Fee'}</option>
 				</select>
 			</div>
@@ -312,7 +312,7 @@
 					{l s='Select how this service price will be added in booking.'}
 					<ul>
 						<li>
-							<b>{l s='Add price in room price'}</b> : {l s='Service price will be added in room base price.'}<br>{l s='(e.g., Room price : 500, service price: 50, final room price : 550)'}
+							<b>{l s='Add price in stay price'}</b> : {l s='Service price will be added in stay base price.'}<br>{l s='(e.g., Stay price : 500, service price: 50, final stay price : 550)'}
 						</li>
 						<li><b>{l s='Add price as convenience fee'}</b> : {l s='Service price will be dispalyed in order summary as "Convenience Fees"'}</li>
 					</ul>
@@ -399,7 +399,7 @@
 	<div id="allow_multiple_quantity_container" {if $product->auto_add_to_cart && $product->isAssociatedToShop()}style="display:none;"{/if}>
 		<div class="form-group">
 			<label class="control-label col-lg-3">
-				<span class="label-tooltip" data-toggle="tooltip" title="{l s='When enabled, customer can order multiple quantity of product otherwise only one quantity can be purchased by customer per room/hotel'}">
+				<span class="label-tooltip" data-toggle="tooltip" title="{l s='When enabled, customer can order multiple quantity of product otherwise only one quantity can be purchased by customer per stay/hotel'}">
 					{l s='Allow ordering of multiple quantities'}
 				</span>
 			</label>
@@ -421,7 +421,7 @@
 			<div class="form-group">
 				<label class="control-label col-lg-3" for="max_quantity">
 					<span class="label-tooltip" data-toggle="tooltip"
-						title="{l s='Enter max allowed quantity per room, enter 0 for unlimited.'}">
+						title="{l s='Enter max allowed quantity per stay, enter 0 for unlimited.'}">
 						{l s='Max quantity allow'}
 					</span>
 				</label>
@@ -432,7 +432,7 @@
 			<div class="form-group">
 				<div class="col-lg-6 col-lg-offset-3">
 					<div class="alert alert-info">
-					{l s='By default all products have infinte quantity, Using this setting you can restrict customer to purchase only one product per room.'}
+					{l s='By default all products have infinte quantity, Using this setting you can restrict customer to purchase only one product per stay.'}
 					</div>
 				</div>
 			</div>

admin/themes/default/template/controllers/normal_products/prices.tpl

@@ -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 room price so the tax rule set on room 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>

admin/themes/default/template/controllers/orders/_cart_booking_demands.tpl

@@ -25,7 +25,7 @@
 		<div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal"><i class="icon-remove-sign"></i></button>
-                <h4 class="modal-title"><i class="icon icon-bed"></i> &nbsp;{l s='Room Services'}</h4>
+                <h4 class="modal-title"><i class="icon icon-bed"></i> &nbsp;{l s='Stay Services'}</h4>
             </div>
 			<div class="modal-body" id="rooms_extra_demands">
                 <ul class="nav nav-tabs" role="tablist">

admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl

@@ -33,16 +33,14 @@
 				{if isset($cart_detail_data) && $cart_detail_data}
 					<thead>
 						<tr>
-							<th><span class="title_box">{l s='Room No.'}</span></th>
-							<th><span class="title_box">{l s='Room Image'}</th>
+							<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='Room Type'}</span></th>
 							<th><span class="title_box">{l s='Duration'}</span></th>
-							{if $occupancy_required_for_booking}
-							<th><span class="fixed-width-lg title_box">{l s='Occupancy'}</span></th>
-						{/if}
+						<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>
 							<th><span class="title_box">{l s='Extra Services / Fees (tax excl)'}</span></th>
-							{* <th><span class="title_box">{l s='Total Rooms Price (tax excl)'}</span></th> *}
+							{* <th><span class="title_box">{l s='Total Stays Price (tax excl)'}</span></th> *}
 							<th><span class="title_box">{l s='Total Price (tax excl)'}</span></th>
 							<th></th>
 						</tr>
@@ -52,13 +50,17 @@
 						{foreach from=$cart_detail_data item=data}
 							<tr  data-id-booking-data="{$data.id}" data-id-product="{$data.id_product}" data-id-room="{$data.id_room}" data-date-from="{$data.date_from}" data-date-to="{$data.date_to}" >
 								<td>{$data.room_num|escape:'html':'UTF-8'} {hook h='displayRoomNumAfter' data=$data type='adminOrder'}</td>
-								<td><img src="{$data.image_link|escape:'html':'UTF-8'}" title="Room image" /></td>
+								<td><img src="{$data.image_link|escape:'html':'UTF-8'}" title="Stay image" /></td>
 								<td>
 									<p>{$data.room_type|escape:'html':'UTF-8'}</p>
 								</td>
 								{assign var="is_full_date" value=($show_full_date && ($data['date_from']|date_format:'%D' == $data['date_to']|date_format:'%D'))}
 								<td>{dateFormat date=$data.date_from full=$is_full_date} - {dateFormat date=$data.date_to full=$is_full_date}</td>
-								{if $occupancy_required_for_booking}
+								{assign var=room_occ_required value=false}
+								{if isset($data.occupancy_required_for_booking)}
+									{assign var=room_occ_required value=$data.occupancy_required_for_booking}
+								{/if}
+								{if $room_occ_required}
 									<td>
 										<div class="dropdown">
 											<button class="booking_guest_occupancy btn btn-default btn-left btn-block input-occupancy" type="button">
@@ -72,7 +74,7 @@
 													<input type="hidden" class="max_children" value="{if isset($data['room_type_info'])}{$data['room_type_info']['max_children']|escape:'html':'UTF-8'}{/if}">
 													<input type="hidden" class="max_guests" value="{if isset($data['room_type_info'])}{$data['room_type_info']['max_guests']|escape:'html':'UTF-8'}{/if}">
 													<div class="occupancy_info_block selected" occ_block_index="0">
-														<div class="occupancy_info_head col-sm-12"><span class="room_num_wrapper">{l s='Room - 1'}</span></div>
+														<div class="occupancy_info_head col-sm-12"><span class="room_num_wrapper">{l s='Stay - 1'}</span></div>
 														<div class="row">
 															<div class="col-xs-6 occupancy_count_block">
 																<div class="col-sm-12">
@@ -116,6 +118,10 @@
 											</div>
 										</div>
 									</td>
+								{else}
+									<td>
+										<span class="text-muted">1</span>
+									</td>
 								{/if}
 								<td id="cart_detail_data_unit_price_{$data.id|escape:'html':'UTF-8'}">
 									{assign var=shown_room_type_price value=$data.feature_price_tax_excl}

admin/themes/default/template/controllers/orders/_overbookings.tpl

@@ -29,7 +29,7 @@
             <div class="table-responsive form-group">
                 <table class="table table-striped">
                     <tr>
-                        <th>{l s='Room No.'}</th>
+                        <th>{l s='Stay No.'}</th>
                         <th>{l s='Room type.'}</th>
                         <th>{l s='Duration'}</th>
                         <th>{l s='Occupancy'}</th>
@@ -77,7 +77,7 @@
                                     {/if}
                                 </td>
                                 <td>
-                                    <a href="#" class="btn btn-default reallocate_overbooking" id_htl_booking="{$data['id']}"><i class="icon-refresh"></i> {l s='Reallocate/Swap Room'}</a>
+                                    <a href="#" class="btn btn-default reallocate_overbooking" id_htl_booking="{$data['id']}"><i class="icon-refresh"></i> {l s='Reallocate/Swap Stay'}</a>
                                 </td>
                                 <td>
                                     {if isset($data['booked_room_info']) && $data['booked_room_info']}
@@ -93,8 +93,8 @@
             </div>
 
             <div class="help-block">
-                <p>- {l s='You can resolve room overbooking with \'Resolve\' column only when the overbooked room is now free for booked duration.'}</p>
-                <p>- {l s='You can also reallocate an overbooked room with an available room to resolve room\'s overbooking.'}</p>
+                <p>- {l s='You can resolve stay overbooking with \'Resolve\' column only when the overbooked stay is now free for booked duration.'}</p>
+                <p>- {l s='You can also reallocate an overbooked stay with an available stay to resolve stay\'s overbooking.'}</p>
             </div>
         </div>
     </div>

admin/themes/default/template/controllers/orders/_product_line.tpl

@@ -30,7 +30,7 @@
             <span class="overbooked_room">{l s='overbooked'}</span>
         {/if}
     </td>
-	<td><img src="{$data.image_link}" title="{l s='Room image'}"></td>
+	<td><img src="{$data.image_link}" title="{l s='Stay image'}"></td>
 	<td>
         <p><a href="{$link->getAdminLink('AdminProducts')|escape:'html':'UTF-8'}&amp;id_product={$data.id_product}&amp;updateproduct" target="_blank"><span>{$data.room_type}</span></a></p>
     </td>
@@ -127,7 +127,7 @@
                         <li>
                             <a href="#" class="room_reallocate_swap" id="reallocate_room_{$data['id']}" data-room_type_name="{$data['room_type_name']}" data-toggle="modal" data-target="#mySwappigModal" data-id_htl_booking="{$data['id']}" data-id_order="{$data['id_order']}" data-room_num='{$data.room_num}' data-id_room_type='{$data.id_product}' data-cust_name='{$data.alloted_cust_name}' data-cust_email='{$data.alloted_cust_email}' data-avail_rm_swap='{$data.avail_rooms_to_swap|@json_encode}' data-avail_realloc_room_types='{$data.avail_room_types_to_realloc|@json_encode}' data-allotment_type='{$data.booking_type}' data-allotment_type_label='{if $data.booking_type == $ALLOTMENT_MANUAL}{l s='Manual'}{else}{l s='Auto'}{/if}' data-comment='{$data.comment}'>
                                 <i class="icon-refresh"></i>
-                                {l s='Reallocate/Swap Room'}
+                                {l s='Reallocate/Swap Stay'}
                             </a>
                         </li>
                         <li>

admin/themes/default/template/controllers/orders/_resolvable_overbookings.tpl

@@ -41,7 +41,7 @@
             <div class="table-responsive form-group">
                 <table class="table table-striped">
                     <tr>
-                        <th>{l s='Room No.'}</th>
+                        <th>{l s='Stay No.'}</th>
                         <th>{l s='Room type'}</th>
                         <th>{l s='Hotel'}</th>
                         <th>{l s='Duration'}</th>

admin/themes/default/template/controllers/orders/_rooms_informaion_table.tpl

@@ -27,12 +27,12 @@
                 <table class="table" id="customer_cart_details">
                     <thead>
                         <tr>
-                            <th><span class="title_box">{l s='Room No.'}</span></th>
+                            <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='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='Room Price (Tax excl.)'}</span></th>
+                            <th><span class="title_box">{l s='Stay Price (Tax excl.)'}</span></th>
                             <th><span class="title_box">{l s='Extra Services/Fee (Tax excl.)'}</span></th>
                             <th><span class="title_box">{l s='Total Tax'}</span></th>
                             <th><span class="title_box">{l s='Total Price (Tax incl.)'}</span></th>
@@ -59,7 +59,7 @@
     <div class="list-empty">
         <div class="list-empty-msg">
             <i class="icon-warning-sign list-empty-icon"></i>
-            {l s='Room information not available.'}
+            {l s='Stay information not available.'}
         </div>
     </div>
 {/if}