Fixed: Addressed feedback changes after discussion.
Co-authored-by: Name <sumit201@webkul.in>
This commit is contained in:
@@ -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="Stay image" />
|
||||
<img class="img img-responsive" width="15px" src="{$base_url}img/rf/{$value.value}" title="Room image" />
|
||||
</td>
|
||||
{/foreach}
|
||||
<!--<td>
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
{/if}
|
||||
|
||||
{hook h='displayRoomNumAfter' data=$data type='adminOrder'}</td>
|
||||
<td><img src="{$data.image_link|escape:'html':'UTF-8'}" title="Stay image" /></td>
|
||||
<td><img src="{$data.image_link|escape:'html':'UTF-8'}" title="Room image" /></td>
|
||||
<td>
|
||||
<p>{$data.room_type|escape:'html':'UTF-8'}</p>
|
||||
</td>
|
||||
|
||||
@@ -156,6 +156,6 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" id="submitRoomChange" class="btn btn-primary"><i class="icon icon-bed"></i> {l s="Update Stays"}</button>
|
||||
<button type="button" id="submitRoomChange" class="btn btn-primary"><i class="icon icon-bed"></i> {l s="Update Rooms"}</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -89,8 +89,8 @@
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="alert alert-warning col-sm-12 realloc_roomtype_change_message" style="display:none">
|
||||
<p>{l s="If room type is changed while stay reallocation then all extra services will be assigned to the selected stay of new room type."}</p>
|
||||
<p>{l s="If you want to change extra services, you can update by editing the stay after reallocation."}</p>
|
||||
<p>{l s="If room type is changed while room reallocation then all extra services will be assigned to the selected room of new room type."}</p>
|
||||
<p>{l s="If you want to change extra services, you can update by editing the room after reallocation."}</p>
|
||||
</div>
|
||||
</div>
|
||||
<p class="error_text" id="realloc_sel_rm_err_p"></p>
|
||||
|
||||
@@ -382,7 +382,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="from-group table-responsive-row clearfix" style="display:none;">
|
||||
<div class="stays-disable-dates-title">{l s='Disable Dates'}</div>
|
||||
<div class="rooms-disable-dates-title">{l s='Disable Dates'}</div>
|
||||
<table class="table rooms-disable-dates">
|
||||
<thead>
|
||||
<tr class="nodrag nodrop">
|
||||
@@ -496,7 +496,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="from-group table-responsive-row clearfix" style="display:none;">
|
||||
<div class="stays-disable-dates-title">{l s='Disable Dates'}</div>
|
||||
<div class="rooms-disable-dates-title">{l s='Disable Dates'}</div>
|
||||
<table class="table rooms-disable-dates">
|
||||
<thead>
|
||||
<tr class="nodrag nodrop">
|
||||
|
||||
@@ -96,7 +96,7 @@ class AdminOrderPreferencesControllerCore extends AdminController
|
||||
),
|
||||
'PS_MIN_BOOKING_OFFSET' => array(
|
||||
'title' => $this->l('Minimum booking offset'),
|
||||
'hint' => $this->l('The minimum booking offset is the minimum number of days before the check-in date that a guest must book a stay. For example, if you set this value to 3 and someone is booking on 2nd of March he can only book stays for dates from and after 3 days, i.e, 5th of March.'),
|
||||
'hint' => $this->l('The minimum booking offset is the minimum number of days before the check-in date that a guest must book a room. For example, if you set this value to 3 and someone is booking on 2nd of March he can only book rooms for dates from and after 3 days, i.e, 5th of March.'),
|
||||
'desc' => $this->l('Set to 0 to disable this feature.'),
|
||||
'type' => 'text',
|
||||
'class' => 'fixed-width-xl',
|
||||
|
||||
@@ -175,11 +175,11 @@ class AdminPPreferencesControllerCore extends AdminController
|
||||
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 rooms. For partially available room, always all possible rooms will be displayed.'),
|
||||
'desc' => $this->l('This option is only for fully available rooms. For partially available rooms, always all possible rooms will be displayed.'),
|
||||
),
|
||||
'PS_BACKOFFICE_ROOM_BOOKING_TYPE' => array(
|
||||
'title' => $this->l('In back-office, add rooms to cart with'),
|
||||
'hint' => $this->l('In room occupancy, while adding room in cart customer has to select per room occupancy and in room quantity customer only has to select number of rooms.'),
|
||||
'hint' => $this->l('In Room occupancy, while adding room in cart customer has to select per room occupancy and in rooms quantity customer only has to select number of rooms.'),
|
||||
'cast' => 'intval',
|
||||
'type' => 'select',
|
||||
'list' => array(
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<th colspan="9" class="table-caption">{l s='Rooms Bookings Detail'}</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>{l s="Stay Num"}</th>
|
||||
<th>{l s="Room Num"}</th>
|
||||
<th>{l s="Room Type"}</th>
|
||||
<th>{l s="Property Name"}</th>
|
||||
<th>{l s="Duration"}</th>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{if isset($list) && $list}
|
||||
|
||||
{l s="Stay Num"}
|
||||
{l s="Room Num"}
|
||||
|
||||
{l s="Room Type"}
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<tr>
|
||||
<th>{l s="Room Type"}</th>
|
||||
<th>{l s="Property Name"}</th>
|
||||
<th>{l s="Stays Qty"}</th>
|
||||
<th>{l s="Rooms Qty"}</th>
|
||||
<th>{l s="Duration"}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
{l s="Property Name"}
|
||||
|
||||
{l s="Stays Qty"}
|
||||
{l s="Rooms Qty"}
|
||||
|
||||
{l s="Duration"}
|
||||
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
<th colspan="9" class="table-caption">{l s='Rooms Booking Detail'}</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>{l s="Stay Image"}</th>
|
||||
<th>{l s="Stay Description"}</th>
|
||||
<th>{l s="Stay Capcity"}</th>
|
||||
<th>{l s="Room Image"}</th>
|
||||
<th>{l s="Room Description"}</th>
|
||||
<th>{l s="Room Capacity"}</th>
|
||||
<th>{l s="Unit Price"}</th>
|
||||
<th>{l s="Stays Qty"}</th>
|
||||
<th>{l s="Rooms Qty"}</th>
|
||||
<th>{l s="Check-in Date"}</th>
|
||||
<th>{l s="Check-out Date"}</th>
|
||||
<th>{l s="Total"}</th>
|
||||
|
||||
@@ -9,7 +9,7 @@ been canceled.
|
||||
Here are your order details:
|
||||
Order reference: {order_name}
|
||||
Order total: {total_paid}
|
||||
Total Stays: {num_rooms}
|
||||
Total Rooms: {num_rooms}
|
||||
|
||||
Hotel details:
|
||||
Hotel Name: {hotel_hotel_name}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
{if isset($list['has_room_bookings']) && $list['has_room_bookings']}
|
||||
<tr>
|
||||
<td>
|
||||
<strong>{l s="Total Stays Cost"}</strong>
|
||||
<strong>{l s="Total Rooms Cost"}</strong>
|
||||
</td>
|
||||
<td>
|
||||
{$list['room_price_tax_excl']}
|
||||
@@ -41,7 +41,7 @@
|
||||
{/if}
|
||||
<tr>
|
||||
<td>
|
||||
<strong>{l s="Stay and Service Tax"}</strong>
|
||||
<strong>{l s="Room and Service Tax"}</strong>
|
||||
</td>
|
||||
<td>
|
||||
{$list['total_order_tax']}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{if isset($list['has_room_bookings']) && $list['has_room_bookings']}
|
||||
{l s="Total Stays Cost"} {$list['room_price_tax_excl']}
|
||||
{l s="Total Rooms Cost"} {$list['room_price_tax_excl']}
|
||||
{/if}
|
||||
|
||||
{if isset($list['has_standalone_products']) && $list['has_standalone_products']}
|
||||
@@ -14,7 +14,7 @@
|
||||
{l s="Total Convenience Fees"} {$list['total_convenience_fee_te']}
|
||||
{/if}
|
||||
|
||||
{l s="Stay and Service Tax"} {$list['total_order_tax']}
|
||||
{l s="Room and Service Tax"} {$list['total_order_tax']}
|
||||
|
||||
{if isset($list['has_tourism_tax']) && $list['has_tourism_tax']}
|
||||
{l s="Total Tourism Tax"} {$list['total_tourism_tax']}
|
||||
|
||||
@@ -12,7 +12,7 @@ Transaction Id: {id_transaction}
|
||||
|
||||
Booking details
|
||||
|
||||
Stay Num
|
||||
Room Num
|
||||
Room Type
|
||||
Hotel
|
||||
Duration
|
||||
|
||||
@@ -14,7 +14,7 @@ Booking details
|
||||
|
||||
Room Type
|
||||
Hotel
|
||||
Num. Stays
|
||||
Num. Rooms
|
||||
Duration
|
||||
{refundBookingHtml}
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ Refund Status: {status_name}
|
||||
|
||||
Booking details
|
||||
|
||||
Stay Num
|
||||
Room Num
|
||||
Room Type
|
||||
Hotel
|
||||
Duration
|
||||
|
||||
@@ -13,7 +13,7 @@ Booking details
|
||||
|
||||
Room Type
|
||||
Hotel
|
||||
Num. Stays
|
||||
Num. Rooms
|
||||
Duration
|
||||
|
||||
{refundBookingHtml}
|
||||
|
||||
@@ -11,7 +11,7 @@ Cancelation Reason: {cancelation_reason}
|
||||
|
||||
Requested Booking Cancellations
|
||||
|
||||
Stay Num
|
||||
Room Num
|
||||
Room Type
|
||||
Hotel
|
||||
Duration
|
||||
|
||||
@@ -12,7 +12,7 @@ Booking details
|
||||
|
||||
Room Type
|
||||
Hotel
|
||||
Num. Stays
|
||||
Num. Rooms
|
||||
Duration
|
||||
|
||||
{refundBookingHtml}
|
||||
|
||||
@@ -263,7 +263,7 @@
|
||||
{block name='blockcart_layer_cart_room_total_price'}
|
||||
<div class="layer_cart_row">
|
||||
<strong class="dark">
|
||||
{l s='Total Room Cost in cart' mod='blockcart'}
|
||||
{l s='Total Rooms Cost in cart' mod='blockcart'}
|
||||
{if $display_tax_label}
|
||||
{if $priceDisplay == 1}
|
||||
{l s='(tax excl.)' mod='blockcart'}
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
<section>
|
||||
<div class="row">
|
||||
<div class="col-md-12 col-lg-6">
|
||||
<p class="chart-label">{l s='Stay Nights' mod='dashinsights'}</p>
|
||||
<p class="chart-label">{l s='Room Nights' mod='dashinsights'}</p>
|
||||
<div class="chart with-transitions insight-chart-wrap" id="dashinsights_room_nights">
|
||||
<svg></svg>
|
||||
</div>
|
||||
|
||||
@@ -356,9 +356,9 @@ class StatsProduct extends ModuleGraph
|
||||
if (Tools::getValue('export')) {
|
||||
$this->_titles['main'][] = $this->l('Date');
|
||||
}
|
||||
$this->_titles['main'][] = $this->l('Stay nights');
|
||||
$this->_titles['main'][] = $this->l('Room nights');
|
||||
$this->_titles['main'][] = $this->l('Views (x100)');
|
||||
$this->_titles['y'] = $this->l('Stay nights, Views (x100)');
|
||||
$this->_titles['y'] = $this->l('Room nights, Views (x100)');
|
||||
$this->_formats['y'] = 'd';
|
||||
|
||||
$this->query[0] = 'SELECT o.`date_add`, SUM(DATEDIFF(hbd.`date_to`, hbd.`date_from`)) AS total
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
{if $total_rooms_wt + $total_additional_services_wt + $total_additional_services_auto_add_wt}
|
||||
<p>
|
||||
<span>
|
||||
{l s='Total Room cost'}
|
||||
{l s='Total rooms cost'}
|
||||
{if $display_tax_label}
|
||||
{if $use_taxes && $priceDisplay == 0}
|
||||
{l s='(tax incl)'}
|
||||
|
||||
@@ -263,7 +263,7 @@
|
||||
{block name='blockcart_layer_cart_room_total_price'}
|
||||
<div class="layer_cart_row">
|
||||
<strong class="dark">
|
||||
{l s='Total Room Cost in cart' mod='blockcart'}
|
||||
{l s='Total Rooms Cost in cart' mod='blockcart'}
|
||||
{if $display_tax_label}
|
||||
{if $priceDisplay == 1}
|
||||
{l s='(tax excl.)' mod='blockcart'}
|
||||
|
||||
@@ -424,7 +424,7 @@
|
||||
{if isset($cart_htl_data)}
|
||||
<tr class="item">
|
||||
<td>
|
||||
<strong>{l s='Total Room Cost'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if} {/if}</strong>
|
||||
<strong>{l s='Total Rooms Cost'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if} {/if}</strong>
|
||||
</td>
|
||||
<td class="text-right">
|
||||
{if $priceDisplay && $use_tax}
|
||||
|
||||
@@ -337,7 +337,7 @@
|
||||
{assign var=total_standard_products_tax_excl value=($order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_STANDALONE) + $order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_HOTEL_STANDALONE))}
|
||||
{if isset($cart_htl_data) && $cart_htl_data}
|
||||
<tr>
|
||||
<td>{l s='Total Room Cost'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if} {/if}</td>
|
||||
<td>{l s='Total Rooms Cost'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if} {/if}</td>
|
||||
<td class="text-right">
|
||||
{if $priceDisplay && $use_tax}
|
||||
<span class="price">{displayWtPriceWithCurrency price=($room_price_tax_excl + $room_services_price_tax_excl - $total_convenience_fee_te) currency=$currency}</span>
|
||||
@@ -765,7 +765,7 @@
|
||||
|
||||
{if isset($cart_htl_data) && $cart_htl_data}
|
||||
<tr>
|
||||
<td>{l s='Total Room Cost'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if} {/if}</td>
|
||||
<td>{l s='Total Rooms Cost'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if} {/if}</td>
|
||||
<td class="text-right">
|
||||
{if $priceDisplay && $use_tax}
|
||||
<span class="price">{displayWtPriceWithCurrency price=($room_price_tax_excl + $room_services_price_tax_excl - $total_convenience_fee_te) currency=$currency}</span>
|
||||
@@ -1080,7 +1080,7 @@
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
<div class="selected-rooms-wrap">
|
||||
{l s='Selected: '}<span class="num-selected-stays">{l s='00'}</span>
|
||||
{l s='Selected: '}<span class="num-selected-rooms">{l s='00'}</span>
|
||||
</div>
|
||||
<div class="actions-wrap">
|
||||
<button class="btn btn-secondary btn-cancel">
|
||||
@@ -1101,7 +1101,7 @@
|
||||
<div class="errors" style="display: none;"></div>
|
||||
|
||||
<div class="well well-sm">
|
||||
<p class="text">{l s='Total cancel request:'} <span class="count-total-stays">{l s='00'}</span></p>
|
||||
<p class="text">{l s='Total cancel request:'} <span class="count-total-rooms">{l s='00'}</span></p>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
|
||||
Reference in New Issue
Block a user