diff --git a/controllers/front/OrderConfirmationController.php b/controllers/front/OrderConfirmationController.php index a60326859..2b5709135 100644 --- a/controllers/front/OrderConfirmationController.php +++ b/controllers/front/OrderConfirmationController.php @@ -469,8 +469,6 @@ class OrderConfirmationControllerCore extends FrontController { if (Tools::getValue('ajax') != 'true') { parent::setMedia(); - $this->addCSS(_THEME_CSS_DIR_.'history.css'); - $this->addJS(_THEME_JS_DIR_.'history.js'); $this->addJS(_THEME_JS_DIR_.'order-confirmation.js'); $this->addCSS(_THEME_CSS_DIR_.'order-confirmation.css'); $this->addJqueryPlugin(array('fancybox')); //fancybox not found for some client theme diff --git a/themes/hotel-reservation-theme/_partials/order-extra-services.tpl b/themes/hotel-reservation-theme/_partials/order-extra-services.tpl index 695b47c28..5e643b6f0 100644 --- a/themes/hotel-reservation-theme/_partials/order-extra-services.tpl +++ b/themes/hotel-reservation-theme/_partials/order-extra-services.tpl @@ -25,53 +25,12 @@ {if (isset($extraDemands) && $extraDemands) || (isset($additionalServices) && $additionalServices)}
- {if isset($extraDemands) && $extraDemands} -
-
-

{l s='Facilities chosen for this booking.'}

-
- {assign var=roomCount value=1} - {foreach $extraDemands as $roomDemand} -
-
- {l s='Room'} {$roomCount|string_format:'%02d'}  - ({if {$roomDemand['adults']} <= 9}0{$roomDemand['adults']}{else}{$roomDemand['adults']}{/if} {if $roomDemand['adults'] > 1}{l s='Adults'}{else}{l s='Adult'}{/if}{if $roomDemand['children'] > 0}, {if {$roomDemand['children']} <= 9}0{$roomDemand['children']}{else}{$roomDemand['children']}{/if} {if $roomDemand['children'] > 1}{l s='Children'}{else}{l s='Child'}{/if}{/if}) -
-
- {foreach $roomDemand['extra_demands'] as $demand} -
-
{$demand['name']|escape:'html':'UTF-8'}
-
- - {if $useTax} - {displayPrice price="{$demand['total_price_tax_incl']|escape:'html':'UTF-8'}" currency=$objOrder->id_currency} - {else} - {displayPrice price="{$demand['total_price_tax_excl']|escape:'html':'UTF-8'}" currency=$objOrder->id_currency} - {/if} - -
-
- {/foreach} -
-
- {assign var=roomCount value=$roomCount+1} - {/foreach} -
- {/if} - - {if isset($additionalServices) && $additionalServices} -
-
-

{l s='Services chosen for this booking.'}

-
+
+ {if isset($additionalServices) && $additionalServices} {assign var=roomCount value=1} {foreach $additionalServices as $key => $roomAdditionalService}
@@ -105,8 +64,46 @@
{assign var=roomCount value=$roomCount+1} {/foreach} -
- {/if} + {else} +
+ {l s='No service found.'} +
+ {/if} +
+
+ {if isset($extraDemands) && $extraDemands} + {assign var=roomCount value=1} + {foreach $extraDemands as $roomDemand} +
+
+ {l s='Room'} {$roomCount|string_format:'%02d'}  + ({if {$roomDemand['adults']} <= 9}0{$roomDemand['adults']}{else}{$roomDemand['adults']}{/if} {if $roomDemand['adults'] > 1}{l s='Adults'}{else}{l s='Adult'}{/if}{if $roomDemand['children'] > 0}, {if {$roomDemand['children']} <= 9}0{$roomDemand['children']}{else}{$roomDemand['children']}{/if} {if $roomDemand['children'] > 1}{l s='Children'}{else}{l s='Child'}{/if}{/if}) +
+
+ {foreach $roomDemand['extra_demands'] as $demand} +
+
{$demand['name']|escape:'html':'UTF-8'}
+
+ + {if $useTax} + {displayPrice price="{$demand['total_price_tax_incl']|escape:'html':'UTF-8'}" currency=$objOrder->id_currency} + {else} + {displayPrice price="{$demand['total_price_tax_excl']|escape:'html':'UTF-8'}" currency=$objOrder->id_currency} + {/if} + +
+
+ {/foreach} +
+
+ {assign var=roomCount value=$roomCount+1} + {/foreach} + {else} +
+ {l s='No facility found.'} +
+ {/if} +
{/if} diff --git a/themes/hotel-reservation-theme/css/order-confirmation.css b/themes/hotel-reservation-theme/css/order-confirmation.css index 654658b95..f7f16bdbe 100644 --- a/themes/hotel-reservation-theme/css/order-confirmation.css +++ b/themes/hotel-reservation-theme/css/order-confirmation.css @@ -190,4 +190,24 @@ #rooms_extra_services .nav-tabs > li.active:after { content: unset; -} \ No newline at end of file +} + +#rooms_extra_services .services_not_booked { + text-align: center; + margin: 30px 0px; + font-size: 14px; +} + +.price-info-tooltip-cont { + min-width: 180px; +} + +.price-info-tooltip-cont .list-row { + display: flex; + justify-content: space-between; + margin: 5px 0; +} + +.price-info-tooltip-cont .list-row p { + margin: 0; +} diff --git a/themes/hotel-reservation-theme/css/order-detail.css b/themes/hotel-reservation-theme/css/order-detail.css index d05fc1e30..3f7544dcd 100644 --- a/themes/hotel-reservation-theme/css/order-detail.css +++ b/themes/hotel-reservation-theme/css/order-detail.css @@ -750,16 +750,6 @@ display: none; } -.ui-tooltip.price-tootip { - box-shadow: 0 2px 6px 0 rgb(0 0 0 / 20%); - background: #FFFFFF; - border: unset; - color: #333; - padding: 2px 10px; - max-height: 310px; - overflow-y: auto; -} - .price-info-tooltip-cont { min-width: 180px; } @@ -1084,6 +1074,12 @@ margin-bottom: 12px; } +#popup-view-extra-services .services_not_booked { + text-align: center; + margin: 30px 0px; + font-size: 14px; +} + /* Guest Tracking page styles - start */ .transform-account .card-text p { margin: 0; diff --git a/themes/hotel-reservation-theme/js/order-confirmation.js b/themes/hotel-reservation-theme/js/order-confirmation.js index 87175d20f..a150a491e 100644 --- a/themes/hotel-reservation-theme/js/order-confirmation.js +++ b/themes/hotel-reservation-theme/js/order-confirmation.js @@ -70,4 +70,41 @@ $(document).ready(function(){ }, }); }); -}); \ No newline at end of file + + initPriceTooltip(); +}); + +function initPriceTooltip() { + if ($('.order-price-info').length) { + $('.order-price-info').each(function () { + $(this).tooltip({ + content: $(this).closest('td').find('.price-info-container').html(), + items: 'span', + trigger: 'hover', + tooltipClass: 'price-tootip', + open: function (event, ui) { + if (typeof (event.originalEvent) === 'undefined') { + return false; + } + + var $id = $(ui.tooltip).attr('id'); + + // close any lingering tooltips + if ($('div.ui-tooltip').not('#' + $id).length) { + return false; + } + }, + close: function (event, ui) { + ui.tooltip.hover(function () { + $(this).stop(true).fadeTo(400, 1); + }, + function () { + $(this).fadeOut('400', function () { + $(this).remove(); + }); + }); + } + }); + }); + } +} \ No newline at end of file