diff --git a/admin/themes/default/template/controllers/access/helpers/form/form.tpl b/admin/themes/default/template/controllers/access/helpers/form/form.tpl index 7c5a71acc..258013c26 100644 --- a/admin/themes/default/template/controllers/access/helpers/form/form.tpl +++ b/admin/themes/default/template/controllers/access/helpers/form/form.tpl @@ -302,11 +302,11 @@
{if isset($hotels) && $hotels}
-

{l s='Hotel Permissions'}

+

{l s='Property Permissions'}

- + @@ -131,7 +131,7 @@
{if isset($room['selected_services']) && $room['selected_services']} diff --git a/admin/themes/default/template/controllers/normal_products/informations.tpl b/admin/themes/default/template/controllers/normal_products/informations.tpl index f049745e3..ab3a25191 100644 --- a/admin/themes/default/template/controllers/normal_products/informations.tpl +++ b/admin/themes/default/template/controllers/normal_products/informations.tpl @@ -263,7 +263,7 @@
id)}style="display:none;"{/if}>
{include file="controllers/products/multishop/checkbox.tpl" field="category_box" type="category_box"}
@@ -276,7 +276,7 @@
id) && $product->selling_preference_type != 0}style="display:none;"{/if}>
{include file="controllers/products/multishop/checkbox.tpl" field="category_box" type="category_box"}
diff --git a/admin/themes/default/template/controllers/orders/_rooms_informaion_table.tpl b/admin/themes/default/template/controllers/orders/_rooms_informaion_table.tpl index c4f8cdeab..189b9a7a8 100644 --- a/admin/themes/default/template/controllers/orders/_rooms_informaion_table.tpl +++ b/admin/themes/default/template/controllers/orders/_rooms_informaion_table.tpl @@ -27,7 +27,7 @@
{l s='Hotel'}{l s='Property'} {l s='All'} diff --git a/admin/themes/default/template/controllers/carts/helpers/view/view.tpl b/admin/themes/default/template/controllers/carts/helpers/view/view.tpl index c4cacfa00..c22482496 100644 --- a/admin/themes/default/template/controllers/carts/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/carts/helpers/view/view.tpl @@ -102,7 +102,7 @@ {dateFormat date=$room['date_from'] full=$is_full_date} - {dateFormat date=$room['date_to'] full=$is_full_date} - {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} {displayWtPriceWithCurrency price=$room['feature_price_tax_excl'] currency=$currency}
- + diff --git a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl index 1dbb62246..54d7c49c7 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -767,7 +767,7 @@ {if $hotel_booking}
-  {l s='Rooms Booking Detail'} {$order_detail_data|@count} +  {l s='Booking Detail'} {$order_detail_data|@count} {if $can_edit && ($currentState->id != Configuration::get('PS_OS_REFUND') && $currentState->id != Configuration::get('PS_OS_CANCELED') && $currentState->id != Configuration::get('PS_OS_NO_SHOW'))}
- + diff --git a/admin/themes/default/template/controllers/products/configuration.tpl b/admin/themes/default/template/controllers/products/configuration.tpl index 7b0e8764f..4d88277f5 100644 --- a/admin/themes/default/template/controllers/products/configuration.tpl +++ b/admin/themes/default/template/controllers/products/configuration.tpl @@ -23,7 +23,7 @@ {if isset($product->id)}
-

{l s='Rooms'}

+

{$htl_room_type['selling_object_plural_name']}

@@ -34,35 +34,35 @@
@@ -224,14 +224,14 @@
  • -  {l s='Create Rooms'} +  {l s='Create %s' sprintf=$htl_room_type['selling_object_plural_name']}
  • @@ -276,7 +276,7 @@
      -
    • {l s='Please save this room first to add dates.'}
    • +
    • {l s='Please save this %s first to add dates.' sprintf=$htl_room_type['selling_object_plural_name']}
    @@ -348,7 +348,7 @@ - +

    {l s='Room'}

    {l s='Unit'}

    {l s='Image'} {l s='Duration'} {l s='Occupancy'} {l s='Room No.'} {l s='Room Type'}{l s='Hotel Name'}{l s='Property Name'} {l s='Duration'} {l s='Total Price (Tax incl.)'}
    @@ -70,8 +70,8 @@
    + + + + + + + + + + + {foreach from=$available_features item=available_feature} + + + {foreach from=$available_feature.featureValues item=value} + + + + {/foreach} + {*-- + {* *} + + + {foreachelse} + + + + {/foreach} + +
    {l s='Feature'}{l s='Feature Image'}
    + + {$available_feature.name} + + + + {if sizeof($available_feature.featureValues)} + + {else} + + {l s='N/A'} - + {l s='Add pre-defined values first'} + + {/if} *} + + + + + {foreach from=$languages key=k item=language} + {if $languages|count > 1} +
    +
    + {/if} + + + {if $languages|count > 1} +
    +
    + + +
    +
    + {/if} + {/foreach} +
    {l s='No features have been defined'}
    + + + {l s='Add a new feature'} +