diff --git a/admin-dev/themes/default/js/admin-theme.js b/admin-dev/themes/default/js/admin-theme.js index e8c42601d..5d49e1189 100644 --- a/admin-dev/themes/default/js/admin-theme.js +++ b/admin-dev/themes/default/js/admin-theme.js @@ -478,11 +478,13 @@ $(document).ready(function() { $('.no-htl-access-option').on('click', function() { $(this).prop('selected', false); }); - initTooltip(); + + initUITooltip(); + }); //end dom ready -function initTooltip($target, contentFn, items) { - var $elements = $target || $('.tooltip-trigger'); +function initUITooltip($target, contentFn, items) { + var $elements = $target || $('.ui-tooltip-trigger'); if (!$elements.length) { return; } @@ -491,11 +493,11 @@ function initTooltip($target, contentFn, items) { if (!contentFn && $this.data('ui-tooltip')) { return; } - $this.tooltip({ + $this.uiTooltip({ content: contentFn || $this.next('.tooltip-content').html(), items: items || 'span', trigger: 'hover', - tooltipClass: 'tooltip-popup', + tooltipClass: 'ui-tooltip-popup', open: function (event, ui) { if (event.buttons == 1 || event.buttons == 3) { ui.tooltip.remove(); diff --git a/admin-dev/themes/default/sass/partials/_tooltip.sass b/admin-dev/themes/default/sass/partials/_tooltip.sass index d1f445386..f3ef5f4b2 100644 --- a/admin-dev/themes/default/sass/partials/_tooltip.sass +++ b/admin-dev/themes/default/sass/partials/_tooltip.sass @@ -1,57 +1,44 @@ -.tooltip_cont - width: 100% - font-size: 14px - font-weight: 600 - .tip_header - margin-bottom: 10px - .tip-body > div - margin-bottom: 6px - margin-right: 10px - -.tip_element_head - font-size: 12px - -.tip_element_value - font-size: 14px - font-weight: 400 - opacity: 0.8 - -.tip-body - display: grid - grid-template-columns: auto auto - &.tip-body-grid - grid-template-columns: 1fr 1fr - gap: 8px 16px - -.ui-tooltip, -.ui-tooltip.ui-widget-content +.ui-tooltip.ui-tooltip-popup border: none padding: 10px box-shadow: 0px 0px 15px 0px rgba(0, 0, 0, 0.15) width: auto -.tooltip-trigger +.ui-tooltip-trigger cursor: pointer display: inline-block vertical-align: middle +.ui-tooltip-content + width: 100% +.ui-tooltip-wrapper + width: 100% + font-size: 14px + font-weight: 600 -.ui-tooltip.tooltip-popup - ul - margin: 0 - padding: 0 0 0 16px - list-style: disc - li - padding: 2px 0 +.ui-tooltip-header + margin-bottom: 5px -.tooltip-popup-row - display: flex - justify-content: space-between - align-items: center - gap: 12px - margin: 3px 0 - white-space: nowrap - label - font-weight: 600 - margin: 0 +.ui-tooltip-body + + > div + margin-bottom: 6px + margin-right: 10px + &.ui-tooltip-body-grid + display: grid + grid-template-columns: auto auto + grid-template-columns: 1fr 1fr + gap: 8px 2px + +.ui-tooltip-elem-head + font-size: 12px + +.ui-tooltip-elem-txt + font-size: 13px + font-weight: 400 + opacity: 0.8 + +.ui-tooltip-label + font-weight: 600 + margin: 0 diff --git a/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl index 8a41e9221..940a17f8e 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl +++ b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl @@ -220,39 +220,37 @@ {/if} - {if $hotels.unselected|@count + $hotels.selected|@count > 1} -

- -

-
-
- - - - - -
-

{l s='Unselected hotels'}

- - {l s='Add'} -
-

{l s='Selected hotels'}

- - {l s='Remove'} -
-
- {/if} +

+ +

+
+
+ + + + + +
+

{l s='Unselected Properties'}

+ + {l s='Add'} +
+

{l s='Selected Properties'}

+ + {l s='Remove'} +
+
{if $cart_rules.unselected|@count + $cart_rules.selected|@count > 0}

diff --git a/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/_hotel_names_tooltip.tpl b/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/_hotel_names_tooltip.tpl index 469679641..eca4b71f3 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/_hotel_names_tooltip.tpl +++ b/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/_hotel_names_tooltip.tpl @@ -24,17 +24,17 @@ {$hotel_names_first|escape:'html':'UTF-8'} {if $hotel_names_remaining} {capture name='hotel_names_tooltip'} -

-
{l s='Selected Hotels'}
+
+
{l s='Selected Hotels'}
{/capture} - {capture name='hotel_names_tooltip_title'}+{$hotel_names_remaining|@count}{/capture} - {include file='helpers/tooltip.tpl' tooltip_content=$smarty.capture.hotel_names_tooltip tooltip_title=$smarty.capture.hotel_names_tooltip_title} + {capture name='hotel_names_tooltip_title'}+{$hotel_names_remaining|@count}{/capture} + {include file='helpers/ui-tooltip.tpl' tooltip_content=$smarty.capture.hotel_names_tooltip tooltip_title=$smarty.capture.hotel_names_tooltip_title} {/if} {else} -- diff --git a/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl index 0c8ab0c56..1c40f4661 100644 --- a/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl @@ -190,6 +190,12 @@ {l s='Total cost:'} {displayWtPriceWithCurrency price=$total_products currency=$currency} + {if $total_tourism_tax > 0} + + {l s='Tourism tax:'} + {displayWtPriceWithCurrency price=$total_tourism_tax currency=$currency} + + {/if} {if $total_discounts != 0} {l s='Total value of vouchers:'} diff --git a/admin-dev/themes/default/template/controllers/customer_threads/page_header_toolbar.tpl b/admin-dev/themes/default/template/controllers/customer_threads/page_header_toolbar.tpl index 9378f1eaf..8597f1679 100644 --- a/admin-dev/themes/default/template/controllers/customer_threads/page_header_toolbar.tpl +++ b/admin-dev/themes/default/template/controllers/customer_threads/page_header_toolbar.tpl @@ -28,7 +28,7 @@ {if is_array($title)} {$title|end|strip_tags} {else} - + {$title|strip_tags|truncate:40} {/if} diff --git a/admin-dev/themes/default/template/controllers/modules_positions/form.tpl b/admin-dev/themes/default/template/controllers/modules_positions/form.tpl index 163785cb2..404008365 100644 --- a/admin-dev/themes/default/template/controllers/modules_positions/form.tpl +++ b/admin-dev/themes/default/template/controllers/modules_positions/form.tpl @@ -100,8 +100,12 @@ var len = values.length; list.find('option').prop('selected', false); - for (var i = 0; i < len; i++) - list.find('option[value="' + $.trim(values[i]) + '"]').prop('selected', true); + for (var i = 0; i < len; i++) { + var value = $.trim(values[i]); + list.find('option').filter(function() { + return this.value === value; + }).prop('selected', true); + } } function position_exception_listchange() { var obj = $(this); diff --git a/admin-dev/themes/default/template/controllers/orders/_hotel_service_products_table.tpl b/admin-dev/themes/default/template/controllers/orders/_hotel_service_products_table.tpl index 6d3920f82..b04e66d96 100644 --- a/admin-dev/themes/default/template/controllers/orders/_hotel_service_products_table.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_hotel_service_products_table.tpl @@ -69,21 +69,21 @@ {displayPrice price=($product.total_price_tax_incl - $product.total_price_tax_excl) currency=$currency->id} {if isset($use_tourism_tax) && $use_tourism_tax && isset($product.tourism_tax_status)} - -   - -