Merge branch 'develop' into gli-480

This commit is contained in:
Shreesh Arora
2021-02-03 19:09:41 +05:30
committed by GitHub
20 changed files with 129 additions and 107 deletions

View File

View File

@@ -698,7 +698,7 @@
<div class="form-group">
{foreach $input.options as $key => $select}
<div class="col-lg-2">
<select name="{$key}" class="fixed-width-lg{if isset($input.class)} {$input.class}{/if}">
<select name="{$key}" class="{if isset($input.class)} {$input.class}{/if}">
<option value="">-</option>
{if $key == 'months'}
{*

View File

@@ -25,7 +25,7 @@
{if $ajax}
<script type="text/javascript">
$(function () {
$(".ajax_table_link").click(function () {
$("#form-{$list_id} .ajax_table_link").click(function () {
var link = $(this);
$.post($(this).attr('href'), function (data) {
if (data.success == 1) {

View File

@@ -336,10 +336,10 @@ class MailCore extends ObjectModel
}
$template_vars['{shop_name}'] = Tools::safeOutput(Configuration::get('PS_SHOP_NAME', null, null, $id_shop));
$template_vars['{shop_url}'] = Context::getContext()->link->getPageLink('index', true, Context::getContext()->language->id, null, false, $id_shop);
$template_vars['{my_account_url}'] = Context::getContext()->link->getPageLink('my-account', true, Context::getContext()->language->id, null, false, $id_shop);
$template_vars['{guest_tracking_url}'] = Context::getContext()->link->getPageLink('guest-tracking', true, Context::getContext()->language->id, null, false, $id_shop);
$template_vars['{history_url}'] = Context::getContext()->link->getPageLink('history', true, Context::getContext()->language->id, null, false, $id_shop);
$template_vars['{shop_url}'] = Context::getContext()->link->getPageLink('index', true, $id_lang, null, false, $id_shop);
$template_vars['{my_account_url}'] = Context::getContext()->link->getPageLink('my-account', true, $id_lang, null, false, $id_shop);
$template_vars['{guest_tracking_url}'] = Context::getContext()->link->getPageLink('guest-tracking', true, $id_lang, null, false, $id_shop);
$template_vars['{history_url}'] = Context::getContext()->link->getPageLink('history', true, $id_lang, null, false, $id_shop);
$template_vars['{color}'] = Tools::safeOutput(Configuration::get('PS_MAIL_COLOR', null, null, $id_shop));
// Get extra template_vars
$extra_template_vars = array();

View File

@@ -428,8 +428,8 @@ abstract class ModuleCore
{
if (version_compare(_PS_VERSION_, $this->ps_versions_compliancy['min'], '<')
|| version_compare(_PS_VERSION_, $this->ps_versions_compliancy['max'], '>')
// || version_compare(_QLOAPPS_VERSION_, $this->qloapps_versions_compliancy['min'], '<')
// || version_compare(_QLOAPPS_VERSION_, $this->qloapps_versions_compliancy['max'], '>')
|| version_compare(_QLOAPPS_VERSION_, $this->qloapps_versions_compliancy['min'], '<')
|| version_compare(_QLOAPPS_VERSION_, $this->qloapps_versions_compliancy['max'], '>')
) {
return false;
} else {

View File

@@ -476,15 +476,21 @@ class AdminCartRulesControllerCore extends AdminController
case 'products':
$products = array('selected' => array(), 'unselected' => array());
$results = Db::getInstance()->executeS('
SELECT DISTINCT name, p.id_product as id
SELECT DISTINCT name, hbl.`hotel_name`, p.id_product as id
FROM '._DB_PREFIX_.'product p
LEFT JOIN `'._DB_PREFIX_.'product_lang` pl
ON (p.`id_product` = pl.`id_product`
AND pl.`id_lang` = '.(int)Context::getContext()->language->id.Shop::addSqlRestrictionOnLang('pl').')
'.Shop::addSqlAssociation('product', 'p').'
WHERE id_lang = '.(int)Context::getContext()->language->id.'
'.Shop::addSqlAssociation('product', 'p').'
LEFT JOIN `'._DB_PREFIX_.'htl_room_type` hrt
ON (p.`id_product` = hrt.`id_product`)
LEFT JOIN `'._DB_PREFIX_.'htl_branch_info_lang` hbl
ON (hrt.`id_hotel` = hbl.`id` AND hbl.`id_lang` = '.(int)Context::getContext()->language->id.Shop::addSqlRestrictionOnLang('pl').')
ORDER BY name');
foreach ($results as $row) {
if($row['hotel_name']) {
$row['name'] .= ' / '.$row['hotel_name'];
}
$products[in_array($row['id'], $selected) ? 'selected' : 'unselected'][] = $row;
}
// filter hotels as per accessed hotels
@@ -502,7 +508,6 @@ class AdminCartRulesControllerCore extends AdminController
1,
1
);
Context::getContext()->smarty->assign('product_rule_itemlist', $products);
$choose_content = $this->createTemplate('product_rule_itemlist.tpl')->fetch();
Context::getContext()->smarty->assign('product_rule_choose_content', $choose_content);

View File

@@ -53,40 +53,6 @@ class AdminGroupsControllerCore extends AdminController
Configuration::get('PS_CUSTOMER_GROUP')
);
$this->fields_list = array(
'id_group' => array(
'title' => $this->l('ID'),
'align' => 'center',
'class' => 'fixed-width-xs'
),
'name' => array(
'title' => $this->l('Group name'),
'filter_key' => 'b!name'
),
'reduction' => array(
'title' => $this->l('Discount (%)'),
'align' => 'right',
'type' => 'percent'
),
'nb' => array(
'title' => $this->l('Members'),
'align' => 'center',
'havingFilter' => true,
),
'show_prices' => array(
'title' => $this->l('Show prices'),
'align' => 'center',
'type' => 'bool',
'callback' => 'printShowPricesIcon',
'orderby' => false
),
'date_add' => array(
'title' => $this->l('Creation date'),
'type' => 'date',
'align' => 'right'
)
);
$this->addRowActionSkipList('delete', $groups_to_keep);
parent::__construct();
@@ -179,19 +145,17 @@ class AdminGroupsControllerCore extends AdminController
$this->action = 'change_show_prices_val';
}
if (Tools::getIsset('viewgroup')) {
$this->list_id = 'customer_group';
if (isset($_POST['submitReset'.$this->list_id])) {
$this->processResetFilters();
}
} else {
$this->list_id = 'group';
}
parent::initProcess();
}
public function postProcess()
{
if (isset($_POST['submitResetcustomer_group'])) {
$this->processResetFilters('customer_group');
}
return parent::postProcess();
}
public function renderView()
{
$this->context = Context::getContext();
@@ -598,6 +562,43 @@ class AdminGroupsControllerCore extends AdminController
$this->displayInformation($unidentified_group_information);
$this->displayInformation($guest_group_information);
$this->displayInformation($default_group_information);
$this->fields_list = array(
'id_group' => array(
'title' => $this->l('ID'),
'align' => 'center',
'class' => 'fixed-width-xs'
),
'name' => array(
'title' => $this->l('Group name'),
'filter_key' => 'b!name'
),
'reduction' => array(
'title' => $this->l('Discount (%)'),
'align' => 'right',
'type' => 'percent'
),
'nb' => array(
'title' => $this->l('Members'),
'align' => 'center',
'havingFilter' => true,
),
'show_prices' => array(
'title' => $this->l('Show prices'),
'align' => 'center',
'type' => 'bool',
'callback' => 'printShowPricesIcon',
'orderby' => false
),
'date_add' => array(
'title' => $this->l('Creation date'),
'type' => 'date',
'align' => 'right'
)
);
$this->processFilter();
return parent::renderList();
}

View File

@@ -199,14 +199,14 @@ class AdminPreferencesControllerCore extends AdminController
// 'cast' => 'intval',
// 'type' => 'bool'
// ),
'PS_MULTISHOP_FEATURE_ACTIVE' => array(
'title' => $this->l('Enable Multistore'),
'desc' => $this->l('The multistore feature allows you to manage several e-shops with one Back Office. If this feature is enabled, a "Multistore" page will be available in the "Advanced Parameters" menu.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool',
'visibility' => Shop::CONTEXT_ALL
),
// 'PS_MULTISHOP_FEATURE_ACTIVE' => array(
// 'title' => $this->l('Enable Multistore'),
// 'desc' => $this->l('The multistore feature allows you to manage several e-shops with one Back Office. If this feature is enabled, a "Multistore" page will be available in the "Advanced Parameters" menu.'),
// 'validation' => 'isBool',
// 'cast' => 'intval',
// 'type' => 'bool',
// 'visibility' => Shop::CONTEXT_ALL
// ),
'PS_SHOP_ACTIVITY' => array(
'title' => $this->l('Main Shop Activity'),
'validation' => 'isInt',

View File

@@ -80,9 +80,9 @@ class AdminProductsControllerCore extends AdminController
// START send access query information to the admin controller
$this->access_select = ' SELECT a.`id_product` FROM '._DB_PREFIX_.'product a';
$this->access_join = ' INNER JOIN '._DB_PREFIX_.'htl_room_type hrt ON (hrt.id_product = a.id_product)';
$this->access_join = ' LEFT JOIN '._DB_PREFIX_.'htl_room_type hrt ON (hrt.id_product = a.id_product)';
if ($acsHtls = HotelBranchInformation::getProfileAccessedHotels($this->context->employee->id_profile, 1, 1)) {
$this->access_where = ' WHERE hrt.id_hotel IN ('.implode(',', $acsHtls).')';
$this->access_where = ' WHERE (hrt.id_hotel IN ('.implode(',', $acsHtls).') OR hrt.id_hotel IS NULL)';
}
parent::__construct();

View File

@@ -25,4 +25,4 @@
*/
define('_PS_INSTALL_VERSION_', '1.6.1.23');
define('_QLO_INSTALL_VERSION_', '1.5.0');
define('_QLO_INSTALL_VERSION_', '1.5.0.0');

View File

@@ -962,16 +962,19 @@ class HotelBookingDetail extends ObjectModel
{
$date_from = date('Y-m-d H:i:s', strtotime($date_from));
$date_to = date('Y-m-d H:i:s', strtotime($date_to));
$table = 'htl_booking_detail';
$table2 = 'htl_cart_booking_data';
$table = 'htl_cart_booking_data';
$table2 = 'htl_booking_detail';
$data = array('id_room' => $swapped_room_id);
$where = 'date_from=\''.pSQL($date_from).'\' AND date_to=\''.pSQL($date_to).'\' AND id_room='.
(int)$current_room_id;
$result = Db::getInstance()->update($table, $data, $where);
$result2 = Db::getInstance()->update($table2, $data, $where);
if ($result) {
$result2 = Db::getInstance()->update($table2, $data, $where);
if ($result2) {
if ($result = Db::getInstance()->update($table, $data, $where)) {
if($room_num = Db::getInstance()->getValue(
'SELECT `room_num` FROM `'._DB_PREFIX_.'htl_room_information` WHERE `id` = '.$swapped_room_id
)) {
$data['room_num'] = $room_num;
}
if ($result2 = Db::getInstance()->update($table2, $data, $where)) {
return true;
}
return false;
@@ -1002,19 +1005,21 @@ class HotelBookingDetail extends ObjectModel
'\' AND `date_to`=\''.pSQL($date_to).'\' AND `id_room`='.(int)$current_room_id
);
$id1 = Db::getInstance()->getValue(
'SELECT `id` FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `date_from`=\''.pSQL($date_from).
$swap_room = Db::getInstance()->getRow(
'SELECT `id`, `room_num` FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `date_from`=\''.pSQL($date_from).
'\' AND `date_to`=\''.pSQL($date_to).'\' AND `id_room`='.(int)$swapped_room_id
);
$id2 = Db::getInstance()->getValue(
'SELECT `id` FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `date_from`=\''.pSQL($date_from).
$curr_room = Db::getInstance()->getRow(
'SELECT `id`, `room_num` FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `date_from`=\''.pSQL($date_from).
'\' AND `date_to`=\''.pSQL($date_to).'\' AND `id_room`='.(int)$current_room_id
);
$sql = 'UPDATE `'._DB_PREFIX_.'htl_cart_booking_data` SET `id_room`=IF(`id`='.(int)$idcrt1.','.
(int)$current_room_id.','.(int)$swapped_room_id.') WHERE `id` IN('.(int)$idcrt1.','.(int)$idcrt2.')';
$sql1 = 'UPDATE `'._DB_PREFIX_.'htl_booking_detail` SET `id_room`=IF(`id`='.(int)$id1.','.(int)$current_room_id.
','.(int)$swapped_room_id.') WHERE `id` IN('.(int)$id1.','.(int)$id2.')';
$sql1 = 'UPDATE `'._DB_PREFIX_.'htl_booking_detail`
SET `id_room`=IF(`id`='.(int)$swap_room['id'].','.(int)$current_room_id.','.(int)$swapped_room_id.'),
`room_num`=IF(`id`='.(int)$swap_room['id'].',\''.$curr_room['room_num'].'\',\''.$swap_room['room_num'].'\')
WHERE `id` IN('.(int)$swap_room['id'].','.(int)$curr_room.')';
if ($result = Db::getInstance()->execute($sql)) {
$result2 = Db::getInstance()->execute($sql1);

View File

@@ -216,10 +216,11 @@ class HotelRoomTypeFeaturePricing extends ObjectModel
*/
public static function countFeaturePriceSpecialDays($specialDays, $date_from, $date_to)
{
$totalDaySeconds = 24*60*60;
$specialDaysCount = 0;
$date_from = date('Y-m-d', strtotime($date_from));
$date_to = date('Y-m-d', strtotime($date_to));
for ($date = strtotime($date_from); $date <= strtotime($date_to)-$totalDaySeconds; $date = ($date + $totalDaySeconds)) {
for($date = $date_from; $date < $date_to; $date = date('Y-m-d', strtotime('+1 day', strtotime($date)))) {
if (in_array(strtolower(Date('D', $date)), $specialDays)) {
$specialDaysCount++;
}
@@ -237,14 +238,15 @@ class HotelRoomTypeFeaturePricing extends ObjectModel
*/
public function getHotelRoomTypesRatesAndInventoryByDate($id_hotel, $id_product=0, $date_from, $date_to)
{
$totalDaySeconds = 24*60*60;
$hotelRoomType = new HotelRoomType();
$context = Context::getContext();
$roomTypeRatesAndInventory = array();
$hotelCartBookingData = new HotelCartBookingData();
$objBookingDetail = new HotelBookingDetail();
$incr = 0;
for ($date = strtotime($date_from); $date <= strtotime($date_to); $date = ($date + $totalDaySeconds)) {
$date_from = date('Y-m-d', strtotime($date_from));
$date_to = date('Y-m-d', strtotime($date_to));
for($date = $date_from; $date < $date_to; $date = date('Y-m-d', strtotime('+1 day', strtotime($date)))) {
$currentDate = date('Y-m-d', $date);
$nextDayDate = date('Y-m-d', strtotime('+1 day', strtotime($currentDate)));
if ($id_product) {
@@ -322,7 +324,6 @@ class HotelRoomTypeFeaturePricing extends ObjectModel
$moduleInstance = new HotelReservationSystem();
$this->errors = array();
if ($featurePricePlans) {
$totalDaySeconds = 24*60*60;
if (isset($featurePricePlans['data']) && $featurePricePlans['data']) {
foreach ($featurePricePlans['data'] as $roomTypeRatesData) {
$dateFrom = date('Y-m-d', strtotime($roomTypeRatesData['dateFrom']));
@@ -391,7 +392,7 @@ class HotelRoomTypeFeaturePricing extends ObjectModel
$this->errors[] = $this->moduleInstance->l('Some error occured while saving Feature Price Plan Info:: Date From : ', 'HotelRoomTypeFeaturePricing').$params['dateFrom'].$this->moduleInstance->l(' Date To : ', 'HotelRoomTypeFeaturePricing').$params['dateFrom'].$this->moduleInstance->l(' Room Type Id : ', 'HotelRoomTypeFeaturePricing').$params['roomTypeId'];
}
} else {
for ($date = strtotime($dateFrom); $date <= strtotime($dateTo)-$totalDaySeconds; $date = ($date + $totalDaySeconds)) {
for($date = $date_from; $date < $date_to; $date = date('Y-m-d', strtotime('+1 day', strtotime($date)))) {
$currentDate = date('Y-m-d', $date);
$nextDayDate = date('Y-m-d', strtotime('+1 day', strtotime($currentDate)));
$params['dateFrom'] = $currentDate;
@@ -629,7 +630,6 @@ class HotelRoomTypeFeaturePricing extends ObjectModel
*/
public static function getRoomTypeTotalPrice($id_product, $date_from, $date_to, $quantity = 0, $id_group = 0)
{
$totalDaySeconds = 24 * 60 * 60;
$totalPrice = array();
$totalPrice['total_price_tax_incl'] = 0;
$totalPrice['total_price_tax_excl'] = 0;
@@ -650,14 +650,15 @@ class HotelRoomTypeFeaturePricing extends ObjectModel
// if date_from and date_to are same then date_to will be the next date date of date_from
if (strtotime($date_from) == strtotime($date_to)) {
$date_to = date('Y-m-d', (strtotime($date_from) + $totalDaySeconds));
$date_to = date('Y-m-d', strtotime('+1 day', strtotime($date_from)));
}
$context = Context::getContext();
$id_currency = Validate::isLoadedObject($context->currency) ? (int)$context->currency->id : (int)Configuration::get('PS_CURRENCY_DEFAULT');
$hotelCartBookingData = new HotelCartBookingData();
for ($date = strtotime($date_from); $date <= (strtotime($date_to)-$totalDaySeconds); $date = ($date+$totalDaySeconds)) {
$currentDate = date('Y-m-d', $date);
$date_from = date('Y-m-d', strtotime($date_from));
$date_to = date('Y-m-d', strtotime($date_to));
for($currentDate = $date_from; $currentDate < $date_to; $currentDate = date('Y-m-d', strtotime('+1 day', strtotime($currentDate)))) {
if ($featurePrice = $hotelCartBookingData->getProductFeaturePricePlanByDateByPriority(
$id_product,
$currentDate,

View File

@@ -39,8 +39,10 @@ class AdminHotelFeaturePricesSettingsController extends ModuleAdminController
$this->_join .= ' LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (pl.`id_product` = a.`id_product` AND pl.`id_lang`='.(int) $this->context->language->id.')';
$this->_join .= ' LEFT JOIN `'._DB_PREFIX_.'htl_room_type_feature_pricing_lang` fpl ON (a.id_feature_price = fpl.id_feature_price AND fpl.`id_lang` = '.(int) $this->context->language->id.')';
$this->_join .= ' LEFT JOIN `'._DB_PREFIX_.'htl_room_type` hrt ON (hrt.`id_product` = a.`id_product`)';
$this->_join .= ' LEFT JOIN `'._DB_PREFIX_.'htl_branch_info_lang` hbl ON (hbl.`id` = hrt.`id_hotel` AND hbl.`id_lang`='.(int) $this->context->language->id.')';
$this->_select .= ' fpl.`feature_price_name` as ftr_price_name, CONCAT(pl.`name`, " (#", a.`id_product`, ")") as product_name, IF(a.impact_type=1 , CONCAT(round(a.impact_value, 2), " ", "%"), a.impact_value) AS impact_value';
$this->_select .= ' fpl.`feature_price_name` as ftr_price_name, CONCAT(pl.`name`, " (#", a.`id_product`, ")") as product_name, hbl.`hotel_name`, IF(a.impact_type=1 , CONCAT(round(a.impact_value, 2), " ", "%"), a.impact_value) AS impact_value';
$this->_select .= ' ,IF(a.impact_type=1 , \''.$this->l('Percentage').'\', \''.$this->l('Fixed Amount').'\')
AS impact_type';
$this->_select .= ' ,IF(a.impact_way=1 , \''.$this->l('Decrease').'\', \''.$this->l('Increase').'\')
@@ -57,17 +59,21 @@ class AdminHotelFeaturePricesSettingsController extends ModuleAdminController
'title' => $this->l('ID'),
'align' => 'center',
),
'product_name' => array(
'title' => $this->l('Room'),
'align' => 'center',
'havingFilter' => true,
'callback' => 'getRoomTypeLink',
),
'ftr_price_name' => array(
'title' => $this->l('Feature Name'),
'align' => 'center',
'havingFilter' => true,
),
'product_name' => array(
'title' => $this->l('Room Type'),
'align' => 'center',
'havingFilter' => true,
'callback' => 'getRoomTypeLink',
),
'hotel_name' => array(
'title' => $this->l('Hotel'),
'align' => 'center',
),
'impact_way' => array(
'title' => $this->l('Impact Way'),
'align' => 'center',

View File

@@ -243,6 +243,7 @@ class AdminOrderRefundRequestsController extends ModuleAdminController
'refundStatuses' => $refundStatuses,
'isRefundCompleted' => $objOrderReturn->hasBeenCompleted(),
'paymentMethods' => $paymentMethods,
'name_controller' => Tools::getValue('controller')
)
);

View File

@@ -201,7 +201,7 @@ class hotelreservationsystem extends Module
$objCurrency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
// get room type additional services
$objRoomDemand = new HotelRoomTypeDemand();
$roomDemandPrices = $objRoomDemand->getRoomTypeDemands($idProduct);
$roomDemandPrices = $objRoomDemand->getRoomTypeDemands($idProduct, 0, 0);
$this->context->smarty->assign(
array(
'idProduct' => $idProduct,

View File

@@ -25,7 +25,7 @@
<strong>{l s='Customer Email' mod='hotelreservationsystem'} :</strong>
</div>
<div class="col-sm-9">
<a target="_blank" href="{$link->getAdminLink('AdminCustomers')|escape:'htmlall':'UTF-8'}&amp;id_customer={$bookingInfo['id_customer']|escape:'html':'UTF-8'}&amp;viewcustomer">{$customer_email|escape:'html':'UTF-8'}</a>
<a target="_blank" href="{$link->getAdminLink('AdminCustomers')|escape:'htmlall':'UTF-8'}&amp;id_customer={$orderReturnInfo['id_customer']|escape:'html':'UTF-8'}&amp;viewcustomer">{$customer_email|escape:'html':'UTF-8'}</a>
</div>
</div>
</div>

View File

@@ -23,6 +23,9 @@
<div class="panel-heading">
<i class="icon-user"></i> {l s='Room Type Additional Facilities' mod='hotelreservationsystem'}
</div>
<div class="alert alert-info">
{l s='To create new please visit' mod='hotelreservationsystem'} <a target="_blank" href="{$link->getAdminLink('AdminRoomTypeGlobalDemand')}">{l s='Additional facilities' mod='hotelreservationsystem'}</a> {l s='page' mod='hotelreservationsystem'}.
</div>
{if isset($allDemands) && $allDemands}
<div id="service_accordian">
{foreach $allDemands as $key => $demand}
@@ -86,20 +89,20 @@
<div class="panel-footer">
<a href="{$link->getAdminLink('AdminProducts')|escape:'html':'UTF-8'}{if isset($smarty.request.page) && $smarty.request.page > 1}&amp;submitFilterproduct={$smarty.request.page|intval}{/if}" class="btn btn-default">
<i class="process-icon-cancel"></i>
{l s='Cancel'}
{l s='Cancel' mod='hotelreservationsystem'}
</a>
<button type="submit" name="submitAddproduct" class="btn btn-default pull-right checkConfigurationClick" disabled="disabled">
<i class="process-icon-loading"></i>
{l s='Save'}
{l s='Save' mod='hotelreservationsystem'}
</button>
<button type="submit" name="submitAddproductAndStay" class="btn btn-default pull-right checkConfigurationClick" disabled="disabled">
<i class="process-icon-loading"></i>
{l s='Save and stay'}
{l s='Save and stay' mod='hotelreservationsystem'}
</button>
</div>
{else}
<div class="alert alert-warning">
{l s='No additional facilities created yet. To create pelase visit' mod='hotelreservationsystem'} <a target="_blank" href="{$link->getAdminLink('AdminRoomTypeGlobalDemand')}">{l s='Additional facilities' mod='hotelreservationsystem'}</a> {l s='page' mod='hotelreservationsystem'}.
{l s='No additional facilities created yet. To create please visit' mod='hotelreservationsystem'} <a target="_blank" href="{$link->getAdminLink('AdminRoomTypeGlobalDemand')}">{l s='Additional facilities' mod='hotelreservationsystem'}</a> {l s='page' mod='hotelreservationsystem'}.
</div>
{/if}
</div>

View File

@@ -78,7 +78,6 @@
.header-rmsearch-wrapper .hotel_dropdown_ul {
position: absolute;
font-size: 14px;
z-index: 100;
font-weight: 400;
padding: 0px;
width: 100%;

View File

@@ -365,12 +365,13 @@
}
#order-opc .avail_vouchers_block .avail_voucher_name {
font-size: 12px;
font-weight: 600;
color: #0000FF;
margin-bottom: 2px;
font-weight: 600;
}
#order-opc .avail_vouchers_block .avail_voucher_name>.voucher_name {
cursor: pointer;
font-size: 14px;
color: #0000FF;
}
#order-opc .avail_vouchers_block .avail_voucher_des {
font-size: 12px;

View File

@@ -309,7 +309,7 @@
{foreach from=$displayVouchers key=key item=voucher name=availVoucher}
<div class="col-xs-12">
<p class="avail_voucher_name">
<span class="voucher_name" data-code="{$voucher.code|escape:'html':'UTF-8'}">{$voucher.code|escape:'html':'UTF-8'}</span>
<span class="voucher_name" data-code="{$voucher.code|escape:'html':'UTF-8'}">{$voucher.code|escape:'html':'UTF-8'} - </span>{$voucher.name}
</p>
<p class="avail_voucher_des">{$voucher['description']}</p>
{if not $smarty.foreach.availVoucher.last}