diff --git a/admin/ajax_products_list.php b/admin/ajax_products_list.php index 03a5f4999..98f9647cb 100644 --- a/admin/ajax_products_list.php +++ b/admin/ajax_products_list.php @@ -58,6 +58,8 @@ if ($excludeIds && $excludeIds != 'NaN') { $excludeVirtuals = (bool)Tools::getValue('excludeVirtuals', true); $exclude_packs = (bool)Tools::getValue('exclude_packs', true); +$bookingProduct = (int) Tools::getValue('booking_product'); + $context = Context::getContext(); $sql = 'SELECT p.`id_product`, pl.`link_rewrite`, p.`reference`, pl.`name`, image_shop.`id_image` id_image, il.`legend`, p.`cache_default_attribute` @@ -72,6 +74,7 @@ $sql = 'SELECT p.`id_product`, pl.`link_rewrite`, p.`reference`, pl.`name`, imag (!empty($excludePackItself) ? ' AND p.id_product <> '.$excludePackItself.' ' : ' '). ($excludeVirtuals ? 'AND NOT EXISTS (SELECT 1 FROM `'._DB_PREFIX_.'product_download` pd WHERE (pd.id_product = p.id_product))' : ''). ($exclude_packs ? 'AND (p.cache_is_pack IS NULL OR p.cache_is_pack = 0)' : ''). + ($bookingProduct ? 'AND p.`booking_product` = '.(int) $bookingProduct : ''). ' GROUP BY p.id_product'; $items = Db::getInstance()->executeS($sql); diff --git a/admin/themes/default/sass/partials/_chosen.sass b/admin/themes/default/sass/partials/_chosen.sass index 9f5f1f7e7..25ff66ef3 100644 --- a/admin/themes/default/sass/partials/_chosen.sass +++ b/admin/themes/default/sass/partials/_chosen.sass @@ -200,6 +200,8 @@ $chosen-sprite-path: '../img/chosen-sprite.png' input position: absolute @include left(-9000px) + &:before + visibility: hidden .chosen-container-multi .chosen-choices diff --git a/admin/themes/default/sass/partials/_icons.sass b/admin/themes/default/sass/partials/_icons.sass index 6788aad63..d6fdf4f09 100644 --- a/admin/themes/default/sass/partials/_icons.sass +++ b/admin/themes/default/sass/partials/_icons.sass @@ -311,7 +311,7 @@ @extend .icon-cogs .icon-AdminAdmin @extend .icon-cog -.icon-AdminParentStats +.icon-AdminStats @extend .icon-bar-chart .icon-AdminStock @extend .icon-archive diff --git a/admin/themes/default/template/controllers/information/helpers/view/view.tpl b/admin/themes/default/template/controllers/information/helpers/view/view.tpl index d142e68a6..463806b60 100644 --- a/admin/themes/default/template/controllers/information/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/information/helpers/view/view.tpl @@ -84,7 +84,7 @@ {l s='Server information'} - {if count($uname)} + {if Tools::strlen($uname) > 0}

{l s='Server information:'} {$uname|escape:'html':'UTF-8'}

diff --git a/admin/themes/default/template/controllers/modules/content.tpl b/admin/themes/default/template/controllers/modules/content.tpl index ec7610a96..bfc706ef7 100644 --- a/admin/themes/default/template/controllers/modules/content.tpl +++ b/admin/themes/default/template/controllers/modules/content.tpl @@ -36,7 +36,7 @@
- PrestaShop Addons + QloApps Addons
@@ -64,7 +64,7 @@
-

{l s='To add a new module, simply connect to your PrestaShop Addons account and all your purchases will be automatically imported.'}

+

{l s='To add a new module, simply connect to your QloApps Addons account and all your purchases will be automatically imported.'}

@@ -82,7 +82,7 @@

{l s='Can I add my own modules?'}

-

{l s='Please note that for security reasons, you can only add modules that are being distributed on PrestaShop Addons, the official marketplace.'}

+

{l s='Please note that for security reasons, you can only add modules that are being distributed on QloApps Addons, the official marketplace.'}

diff --git a/admin/themes/default/template/controllers/modules/page_header_toolbar.tpl b/admin/themes/default/template/controllers/modules/page_header_toolbar.tpl index 8396a808b..f6cfd6740 100644 --- a/admin/themes/default/template/controllers/modules/page_header_toolbar.tpl +++ b/admin/themes/default/template/controllers/modules/page_header_toolbar.tpl @@ -67,20 +67,22 @@
{l s='Recommended Modules and Services'}
- {if $add_permission eq '1' && ($context_mode != Context::MODE_HOST)} -
  • - - -
    {l s='Add a new module'}
    -     -
    • - {else} -
  • - - -
    {l s='Add a new module'}
    -     -
    • + {if $add_permission eq '1'} + {if $context_mode != Context::MODE_HOST} +
  • + + +
    {l s='Add a new module'}
    +     +
    • + {else} +
  • + + +
    {l s='Add a new module'}
    +     +
    • + {/if} {/if} {if isset($help_link)} {*
  • diff --git a/admin/themes/default/template/controllers/normal_products/prices.tpl b/admin/themes/default/template/controllers/normal_products/prices.tpl index 2767c8b35..285f3d312 100644 --- a/admin/themes/default/template/controllers/normal_products/prices.tpl +++ b/admin/themes/default/template/controllers/normal_products/prices.tpl @@ -395,7 +395,7 @@ $(document).ready(function () {
    {if !$multi_shop} - + {else}
    + diff --git a/admin/themes/default/template/controllers/products/informations.tpl b/admin/themes/default/template/controllers/products/informations.tpl index 89ff4ac8c..d66b7e120 100644 --- a/admin/themes/default/template/controllers/products/informations.tpl +++ b/admin/themes/default/template/controllers/products/informations.tpl @@ -137,7 +137,7 @@ {l s='Select Hotel'}
    - {foreach from=$htl_info item=htl_dtl} {/foreach} diff --git a/admin/themes/default/template/controllers/products/prices.tpl b/admin/themes/default/template/controllers/products/prices.tpl index 5713c330d..b9d0b26d2 100644 --- a/admin/themes/default/template/controllers/products/prices.tpl +++ b/admin/themes/default/template/controllers/products/prices.tpl @@ -494,7 +494,7 @@ $(document).ready(function () {
    {if !$multi_shop} - + {else}
    +
    @@ -483,6 +483,9 @@ {block name=script} -{/block} \ No newline at end of file +{/block} diff --git a/modules/hotelreservationsystem/views/templates/admin/hotel_feature_prices_settings/helpers/form/form.tpl b/modules/hotelreservationsystem/views/templates/admin/hotel_feature_prices_settings/helpers/form/form.tpl index 24072a43b..a3da67a68 100644 --- a/modules/hotelreservationsystem/views/templates/admin/hotel_feature_prices_settings/helpers/form/form.tpl +++ b/modules/hotelreservationsystem/views/templates/admin/hotel_feature_prices_settings/helpers/form/form.tpl @@ -323,4 +323,11 @@ {addJsDef autocomplete_room_search_url = $link->getAdminLink('AdminHotelFeaturePricesSettings')} {addJsDef defaultcurrency_sign = $defaultcurrency_sign mod='hotelreservationsystem'} {addJsDef booking_date_from = $date_from mod='hotelreservationsystem'} -{/strip} \ No newline at end of file +{/strip} + +{block name=script} + +{/block} diff --git a/modules/hotelreservationsystem/views/templates/admin/hotel_features/helpers/form/form.tpl b/modules/hotelreservationsystem/views/templates/admin/hotel_features/helpers/form/form.tpl index 8a5472710..2464898f4 100644 --- a/modules/hotelreservationsystem/views/templates/admin/hotel_features/helpers/form/form.tpl +++ b/modules/hotelreservationsystem/views/templates/admin/hotel_features/helpers/form/form.tpl @@ -133,3 +133,10 @@ {addJsDefL name=chld_ftr_text_err}{l s='Enter child feature name.' js=1 mod='hotelreservationsystem'}{/addJsDefL} {addJsDefL name=pos_numeric_err}{l s='Position should be numeric.' js=1 mod='hotelreservationsystem'}{/addJsDefL} {/strip} + +{block name=script} + +{/block} diff --git a/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/view.tpl b/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/view.tpl index 936793a14..4c54fdddd 100644 --- a/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/view.tpl +++ b/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/view.tpl @@ -188,7 +188,7 @@
    {if !isset($booking_product) || (isset($booking_product) && $booking_product == 1)}{l s='Booking Calender' mod='hotelreservationsystem'}{else}{l s='Service Products' mod='hotelreservationsystem'}{/if } - +
    {if !isset($booking_product) || (isset($booking_product) && $booking_product == 1)}
    diff --git a/modules/hotelreservationsystem/views/templates/admin/order_refund_rules/helpers/form/form.tpl b/modules/hotelreservationsystem/views/templates/admin/order_refund_rules/helpers/form/form.tpl index e685b6898..76df5b221 100644 --- a/modules/hotelreservationsystem/views/templates/admin/order_refund_rules/helpers/form/form.tpl +++ b/modules/hotelreservationsystem/views/templates/admin/order_refund_rules/helpers/form/form.tpl @@ -133,3 +133,10 @@
    + +{block name=script} + +{/block} diff --git a/modules/hotelreservationsystem/views/templates/admin/room_type_global_demand/helpers/form/form.tpl b/modules/hotelreservationsystem/views/templates/admin/room_type_global_demand/helpers/form/form.tpl index 3c0448dbc..696bf3c9e 100644 --- a/modules/hotelreservationsystem/views/templates/admin/room_type_global_demand/helpers/form/form.tpl +++ b/modules/hotelreservationsystem/views/templates/admin/room_type_global_demand/helpers/form/form.tpl @@ -274,4 +274,11 @@
    -
    \ No newline at end of file +
    + +{block name=script} + +{/block} diff --git a/modules/statsbestcategories/statsbestcategories.php b/modules/statsbestcategories/statsbestcategories.php index 1b6feb710..f776d314d 100644 --- a/modules/statsbestcategories/statsbestcategories.php +++ b/modules/statsbestcategories/statsbestcategories.php @@ -130,10 +130,6 @@ class StatsBestCategories extends ModuleGrid
    '.$this->displayName.'
    '; - if (!(Module::isEnabled('statsdata') && Configuration::get('PS_STATSDATA_PAGESVIEWS'))) { - $link = $this->context->link->getAdminLink('AdminModules').'&configure=statsdata'; - $this->html .= '
    '.$this->l('You must enable the "Save global page views" option from ').'Data mining for statistics'.$this->l(' module in order to display the most viewed hotels, or use the QloApps Google Analytics module.').'
    '; - } $this->html .= $this->engine($engine_params).'
    diff --git a/modules/statsbestproducts/statsbestproducts.php b/modules/statsbestproducts/statsbestproducts.php index fbfff36f1..788dd72b9 100644 --- a/modules/statsbestproducts/statsbestproducts.php +++ b/modules/statsbestproducts/statsbestproducts.php @@ -136,10 +136,7 @@ class StatsBestProducts extends ModuleGrid } $html = '
    '.$this->displayName.'
    '; - if (!(Module::isEnabled('statsdata') && Configuration::get('PS_STATSDATA_PAGESVIEWS'))) { - $link = $this->context->link->getAdminLink('AdminModules').'&configure=statsdata'; - $html .= '
    '.$this->l('You must enable the "Save global page views" option from ').'Data mining for statistics'.$this->l(' module in order to display the most viewed room types, or use the QloApps Google Analytics module.').'
    '; - } + $html .= $this->engine($engine_params).' '.$this->l('CSV Export').' diff --git a/modules/statsforecast/views/css/conversion-graph.css b/modules/statsforecast/views/css/conversion-graph.css index bce88b010..84e9bccf3 100644 --- a/modules/statsforecast/views/css/conversion-graph.css +++ b/modules/statsforecast/views/css/conversion-graph.css @@ -26,7 +26,8 @@ min-width: 150px; margin-bottom: 25px; padding: 10px 15px; - border: 1.5px solid #555; + border: 1.5px solid transparent; + border-radius: 2px; background-color: #CFE2F3; color: #111; } @@ -37,7 +38,7 @@ } connection { - border: 1px solid #000; + border: 1px solid #777; } connection span { diff --git a/modules/statsnewsletter/statsnewsletter.php b/modules/statsnewsletter/statsnewsletter.php index ea837ec28..197966f60 100644 --- a/modules/statsnewsletter/statsnewsletter.php +++ b/modules/statsnewsletter/statsnewsletter.php @@ -129,6 +129,7 @@ class StatsNewsletter extends ModuleGraph $this->_titles['main'][1] = $this->l('Visitors'); $this->_titles['main'][2] = $this->l('Newsletter statistics'); $this->_titles['main'][3] = $this->l('Both'); + $this->_formats['y'] = 'd'; $this->_query = 'SELECT newsletter_date_add FROM `'._DB_PREFIX_.'customer` diff --git a/modules/statspersonalinfos/statspersonalinfos.php b/modules/statspersonalinfos/statspersonalinfos.php index a08bee698..38c4ba2fe 100644 --- a/modules/statspersonalinfos/statspersonalinfos.php +++ b/modules/statspersonalinfos/statspersonalinfos.php @@ -314,7 +314,7 @@ class StatsPersonalInfos extends ModuleGraph FROM `'._DB_PREFIX_.'customer` WHERE (YEAR(CURDATE()) - YEAR(`birthday`)) - (RIGHT(CURDATE(), 5) < RIGHT(`birthday`, 5)) >= 60 '.Shop::addSqlRestriction(Shop::SHARE_CUSTOMER).' - AND `birthday` IS NOT NULL'; + AND `birthday` IS NOT NULL AND `birthday` != "0000-00-00"'; $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow($sql); if (isset($result['total']) && $result['total']) { $this->_values[] = $result['total']; diff --git a/modules/statsproduct/statsproduct.php b/modules/statsproduct/statsproduct.php index fcd91f0e6..ebb3f2538 100644 --- a/modules/statsproduct/statsproduct.php +++ b/modules/statsproduct/statsproduct.php @@ -343,6 +343,7 @@ class StatsProduct extends ModuleGraph $this->_titles['main'][1] = $this->l('Views (x100)'); $this->_titles['x'] = $this->l('Date'); $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 FROM `'._DB_PREFIX_.'order_detail` od diff --git a/modules/statsregistrations/statsregistrations.php b/modules/statsregistrations/statsregistrations.php index 6931a4cc6..9fe40a18b 100644 --- a/modules/statsregistrations/statsregistrations.php +++ b/modules/statsregistrations/statsregistrations.php @@ -171,6 +171,7 @@ class StatsRegistrations extends ModuleGraph '.Shop::addSqlRestriction(Shop::SHARE_CUSTOMER).' AND `date_add` BETWEEN'; $this->_titles['main'] = $this->l('Number of customer registrations'); + $this->_formats['y'] = 'd'; $this->setDateGraph($layers, true); } diff --git a/modules/statssales/statssales.php b/modules/statssales/statssales.php index c56931ab6..0ddaece5a 100644 --- a/modules/statssales/statssales.php +++ b/modules/statssales/statssales.php @@ -234,6 +234,10 @@ class StatsSales extends ModuleGraph return $this->getOrderStatusesData(); } + if ($this->option == 1) { + $this->_formats['y'] = 'd'; + } + $this->query = 'SELECT o.`invoice_date`, ROUND(o.`total_paid_real` / o.`conversion_rate`, 2) as total_paid_real, ( SELECT hbd.`id_hotel` diff --git a/modules/statsvisits/statsvisits.php b/modules/statsvisits/statsvisits.php index f96716af5..ddde51efa 100644 --- a/modules/statsvisits/statsvisits.php +++ b/modules/statsvisits/statsvisits.php @@ -157,6 +157,7 @@ class StatsVisits extends ModuleGraph protected function getData($layers) { $this->setDateGraph($layers, true); + $this->_formats['y'] = 'd'; } protected function setAllTimeValues($layers) diff --git a/modules/wkhotelfilterblock/views/templates/hook/htlfilterblock.tpl b/modules/wkhotelfilterblock/views/templates/hook/htlfilterblock.tpl index 7db81900d..edd16b240 100644 --- a/modules/wkhotelfilterblock/views/templates/hook/htlfilterblock.tpl +++ b/modules/wkhotelfilterblock/views/templates/hook/htlfilterblock.tpl @@ -19,7 +19,7 @@
    - {if isset($config) && $config['SHOW_AMENITIES_FILTER']} + {if isset($config) && $config['SHOW_AMENITIES_FILTER'] && $all_feat}
    diff --git a/modules/wkhotelfilterblock/wkhotelfilterblock.php b/modules/wkhotelfilterblock/wkhotelfilterblock.php index e2fa40f38..41ad65e6b 100644 --- a/modules/wkhotelfilterblock/wkhotelfilterblock.php +++ b/modules/wkhotelfilterblock/wkhotelfilterblock.php @@ -64,7 +64,9 @@ class wkhotelfilterblock extends Module if ($this->context->controller->php_self == 'category') { $htl_id_category = Tools::getValue('id_category'); - if (Validate::isLoadedObject($objCategory = new Category((int) $htl_id_category))) { + if (Validate::isLoadedObject($objCategory = new Category((int) $htl_id_category)) + && ($id_hotel = HotelBranchInformation::getHotelIdByIdCategory($htl_id_category)) + ) { if ($objCategory->hasParent(Configuration::get('PS_LOCATIONS_CATEGORY'))) { Media::addJsDef(array('noRoomAvailTxt' => $this->l('No room available', false, true))); @@ -73,8 +75,6 @@ class wkhotelfilterblock extends Module $id_lang = $this->context->language->id; $all_feat = FeatureCore::getFeatures($id_lang); - $id_hotel = HotelBranchInformation::getHotelIdByIdCategory($htl_id_category); - $max_adult = HotelRoomType::getMaxAdults($id_hotel); $max_child = HotelRoomType::getMaxChild($id_hotel); diff --git a/modules/wkhotelroom/classes/WkHotelRoomDisplay.php b/modules/wkhotelroom/classes/WkHotelRoomDisplay.php index f324aba82..51406ada8 100644 --- a/modules/wkhotelroom/classes/WkHotelRoomDisplay.php +++ b/modules/wkhotelroom/classes/WkHotelRoomDisplay.php @@ -152,7 +152,7 @@ class WkHotelRoomDisplay extends ObjectModel // update global configuration values in multilang Configuration::updateValue('HOTEL_ROOM_DISPLAY_HEADING', $HOTEL_ROOM_DISPLAY_HEADING); Configuration::updateValue('HOTEL_ROOM_DISPLAY_DESCRIPTION', $HOTEL_ROOM_DISPLAY_DESCRIPTION); - if ($roomTypes = HotelHelper::getPsProducts(Configuration::get('PS_LANG_DEFAULT'), 0, 5)) { + if ($roomTypes = HotelHelper::getPsProducts(Configuration::get('PS_LANG_DEFAULT'), 0, 5, 1)) { foreach ($roomTypes as $product) { if (Validate::isLoadedObject($objProduct = new Product($product['id_product']))) { $objRoomBlock = new WkHotelRoomDisplay(); diff --git a/modules/wkhotelroom/views/js/WkHotelRoomBlockAdmin.js b/modules/wkhotelroom/views/js/WkHotelRoomBlockAdmin.js index 3bec54859..7aee0d3a2 100644 --- a/modules/wkhotelroom/views/js/WkHotelRoomBlockAdmin.js +++ b/modules/wkhotelroom/views/js/WkHotelRoomBlockAdmin.js @@ -38,6 +38,7 @@ $(document).ready(function() { data: { q: word, _: n, + booking_product: '1', }, success: function(result) { if (result) { diff --git a/modules/wkroomsearchblock/wkroomsearchblock.php b/modules/wkroomsearchblock/wkroomsearchblock.php index f40e7f0f1..dc696e4af 100644 --- a/modules/wkroomsearchblock/wkroomsearchblock.php +++ b/modules/wkroomsearchblock/wkroomsearchblock.php @@ -124,7 +124,9 @@ class WkRoomSearchBlock extends Module { if ('category' == Tools::getValue('controller')) { $idCategory = Tools::getValue('id_category'); - if (Validate::isLoadedObject($objCategory = new Category((int) $idCategory))) { + if (Validate::isLoadedObject($objCategory = new Category((int) $idCategory)) + && HotelBranchInformation::getHotelIdByIdCategory($idCategory) + ) { if ($objCategory->hasParent(Configuration::get('PS_LOCATIONS_CATEGORY'))) { $objSearchHelper = new WkRoomSearchHelper(); $objSearchHelper->assignSearchPanelVariables(); diff --git a/pdf/invoice.tax-tab.tpl b/pdf/invoice.tax-tab.tpl index b38577f33..cadbb0d4e 100644 --- a/pdf/invoice.tax-tab.tpl +++ b/pdf/invoice.tax-tab.tpl @@ -39,7 +39,7 @@ {l s='Tax Details' pdf='true'} - {l s='Tax Detail' pdf='true'} + {l s='Taxable category' pdf='true'} {if isset($showTaxName) && $showTaxName} {l s='Tax Name' pdf='true'} {/if} diff --git a/themes/hotel-reservation-theme/404.tpl b/themes/hotel-reservation-theme/404.tpl index c770d8a48..8472e2721 100644 --- a/themes/hotel-reservation-theme/404.tpl +++ b/themes/hotel-reservation-theme/404.tpl @@ -23,22 +23,17 @@ * International Registered Trademark & Property of PrestaShop SA *}
    -

    {l s='This page is not available'}

    + + +

    {l s='Page not found!!!'}

    {l s='We\'re sorry, but the Web address you\'ve entered is no longer available.'}

    -

    {l s='To find a room type, please type its name in the field below.'}

    -
    -
    -
    - - - -
    -
    -
    - -
    {l s='Home page'}
    +
    + + {l s='Home Page'} + +
    diff --git a/themes/hotel-reservation-theme/_partials/occupancy_field.tpl b/themes/hotel-reservation-theme/_partials/occupancy_field.tpl index 4adb17599..64f9f8984 100644 --- a/themes/hotel-reservation-theme/_partials/occupancy_field.tpl +++ b/themes/hotel-reservation-theme/_partials/occupancy_field.tpl @@ -63,8 +63,8 @@
    - -
    + +
    {$occupancy['children']|escape:'htmlall':'UTF-8'} @@ -174,7 +174,10 @@ {/if}
    - {l s='Add Room'} + + + {l s='Add Room'} +
    \ No newline at end of file diff --git a/themes/hotel-reservation-theme/_partials/service-products-list-row.tpl b/themes/hotel-reservation-theme/_partials/service-products-list-row.tpl index 9f4167318..bf16754d8 100644 --- a/themes/hotel-reservation-theme/_partials/service-products-list-row.tpl +++ b/themes/hotel-reservation-theme/_partials/service-products-list-row.tpl @@ -25,7 +25,7 @@ {foreach $product.images as $image} {if $image['cover'] == 0} - {/if} {/foreach} diff --git a/themes/hotel-reservation-theme/address.tpl b/themes/hotel-reservation-theme/address.tpl index 3e3e9da78..e581f5382 100644 --- a/themes/hotel-reservation-theme/address.tpl +++ b/themes/hotel-reservation-theme/address.tpl @@ -22,14 +22,24 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} -{capture name=path}{l s='Your address'}{/capture} +{capture name=path} + + {l s='My account'} + + + {$navigationPipe} + + + {l s='Address'} + +{/capture} {if isset($smarty.get.updated) && $smarty.get.updated}

    {l s='Your address has been successfully updated.'}

    {/if}
    -

    {l s='Your address'}

    +

    {l s='Address'}

    {if isset($id_address) && (isset($smarty.post.alias) || isset($address->alias))} {l s='Modify address'} @@ -215,7 +225,7 @@

    diff --git a/themes/hotel-reservation-theme/authentication.tpl b/themes/hotel-reservation-theme/authentication.tpl index 393e1f4c8..555f52585 100644 --- a/themes/hotel-reservation-theme/authentication.tpl +++ b/themes/hotel-reservation-theme/authentication.tpl @@ -464,49 +464,51 @@ {l s='(Five characters minimum)'}
    -
    - -
    -
    - - {* - {l s='January'} - {l s='February'} - {l s='March'} - {l s='April'} - {l s='May'} - {l s='June'} - {l s='July'} - {l s='August'} - {l s='September'} - {l s='October'} - {l s='November'} - {l s='December'} - *} -
    -
    - -
    -
    - + {if isset($birthday) && $birthday} +
    + +
    +
    + + {* + {l s='January'} + {l s='February'} + {l s='March'} + {l s='April'} + {l s='May'} + {l s='June'} + {l s='July'} + {l s='August'} + {l s='September'} + {l s='October'} + {l s='November'} + {l s='December'} + *} +
    +
    + +
    +
    + +
    -
    + {/if} {if isset($newsletter) && $newsletter}
    diff --git a/themes/hotel-reservation-theme/css/global.css b/themes/hotel-reservation-theme/css/global.css index 3cd05730d..e9125a210 100644 --- a/themes/hotel-reservation-theme/css/global.css +++ b/themes/hotel-reservation-theme/css/global.css @@ -8312,47 +8312,36 @@ table.discount i { #pagenotfound .pagenotfound { max-width: 824px; - margin: 100px auto 100px auto; + margin: 0px auto; text-align: center; } - #pagenotfound .pagenotfound .img-404 { - padding: 8px 0 27px 0; } - #pagenotfound .pagenotfound .img-404 img { - max-width: 100%; } + #pagenotfound .pagenotfound img { + margin: 0 auto; } #pagenotfound .pagenotfound h1 { - font: 600 28px/34px 'Oxygen', serif; + font-size: 40px; + font-weight: 700; color: #333; - text-transform: uppercase; margin-bottom: 7px; } #pagenotfound .pagenotfound p { - font: 600 16px/20px 'Oxygen', serif; color: #555454; - text-transform: uppercase; - border-bottom: 1px solid #d6d4d4; padding-bottom: 19px; - margin-bottom: 20px; } - #pagenotfound .pagenotfound h3 { - font-weight: bold; - color: #333; - font-size: 13px; - line-height: normal; - margin-bottom: 18px; } - #pagenotfound .pagenotfound label { - font-weight: normal; } - @media (max-width: 767px) { - #pagenotfound .pagenotfound label { - display: block; } } - #pagenotfound .pagenotfound .form-control { - max-width: 293px; - display: inline-block; - margin-right: 5px; } - @media (max-width: 767px) { - #pagenotfound .pagenotfound .form-control { - margin: 0 auto 15px auto; - display: block; } } + margin-top: 30px; + font-size: 18px; + line-height: 24px; + margin-bottom: 0; } #pagenotfound .pagenotfound .buttons { - padding: 48px 0 20px 0; } - #pagenotfound .pagenotfound .buttons .button-medium i.left { - font-size: 17px; } + margin-top: 5px; } + #pagenotfound .pagenotfound .buttons a.btn-primary { + border: none; + border-radius: 2px; + font-size: 14px; + padding: 15px 20px; + font-weight: 600; + background-color: #1292FF; + color: #FFFFFF; } + #pagenotfound .pagenotfound .buttons a.btn-primary:hover { + opacity: 0.8; } + #pagenotfound .pagenotfound .buttons a.btn-primary:hover span { + background: none; } #account-creation_form fieldset.reversoform { padding: 10px !important; } diff --git a/themes/hotel-reservation-theme/css/maintenance.css b/themes/hotel-reservation-theme/css/maintenance.css index 9ff35daca..da78fb1d8 100644 --- a/themes/hotel-reservation-theme/css/maintenance.css +++ b/themes/hotel-reservation-theme/css/maintenance.css @@ -129,6 +129,154 @@ button[type='button'].cancel-login { color: #FFF; } +.header-container { + display: flex; + justify-content: center; + align-items: center; + margin-right: auto; + margin-left: auto; + position: relative; +} + +.header-container.multilang .language-selector-wrap { + position: absolute; + right: 0; +} + +@media (min-width: 768px) { + .header-container { + width: 750px; + } +} +@media (min-width: 992px) { + .header-container { + width: 970px; + } +} +@media (min-width: 1200px) { + .header-container { + width: 1170px; + } +} + +.header-container img { + display: block; + max-height: 60px; + max-width: 100%; + margin: 0 auto; +} + +.header-container .language-selector-wrap { + display: flex; + justify-content: end; +} + +/* language-selector - start */ +.dropdown { + position: relative; +} +.dropdown-toggle { + display: inline-block; + background-color: transparent; + padding: 0; + margin-bottom: 0; + font-size: 14px; + font-weight: bold; + color: #333; + line-height: 1.42857; + text-align: center; + vertical-align: middle; + cursor: pointer; + border: 1px solid transparent; + border-radius: 0px; + white-space: nowrap; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + -o-user-select: none; + user-select: none; +} +.dropdown-toggle:focus { + outline: 0; +} +.dropdown-toggle .caret { + display: inline-block; + width: 0; + height: 0; + margin-left: 0; + vertical-align: middle; + border-top-color: white; + border-top: 4px solid #000; + border-right: 4px solid transparent; + border-left: 4px solid transparent; + border-bottom: 0 dotted; + content: ""; +} +.dropdown-menu { + position: absolute; + top: 100%; + right: 0; + z-index: 1000; + display: none; + float: left; + min-width: 160px; + padding: 5px 0; + margin: 2px 0 0; + font-size: 14px; + text-align: left; + list-style: none; + background-color: #fff; + background-clip: padding-box; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.15); + border-radius: 0; + -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); + box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); +} +.dropdown-menu > li > a { + display: block; + padding: 3px 20px; + clear: both; + font-weight: 400; + line-height: 1.42857143; + color: #333333; + text-decoration: none; + white-space: nowrap; +} +.dropdown-menu > li > a:hover, +.dropdown-menu > li > a:focus { + color: #262626; + background-color: #f5f5f5; +} +.dropdown-menu > .active > a, +.dropdown-menu > .active > a:hover, +.dropdown-menu > .active > a:focus { + color: #fff; + background-color: #337ab7; + outline: 0; +} +.dropdown-menu > .disabled > a, +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { + color: #777777; + pointer-events: none; +} +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { + text-decoration: none; + cursor: not-allowed; + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +} +.open > .dropdown-menu { + display: block; +} +.open > a { + outline: 0; +} +/* language-selector - end */ + #maintenance .logo { padding: 12px; text-align: center; } diff --git a/themes/hotel-reservation-theme/css/occupancy.css b/themes/hotel-reservation-theme/css/occupancy.css index 6523d35ee..37e510c0a 100644 --- a/themes/hotel-reservation-theme/css/occupancy.css +++ b/themes/hotel-reservation-theme/css/occupancy.css @@ -56,6 +56,13 @@ .booking_occupancy_wrapper .add_new_occupancy_btn:active, .booking_occupancy_wrapper .add_new_occupancy_btn:focus, .booking_occupancy_wrapper .add_new_occupancy_btn:hover { text-decoration: none; color: #0000FF;} + .booking_occupancy_wrapper .add_new_occupancy_btn.disabled, + .booking_occupancy_wrapper .add_new_occupancy_btn.disabled:active, + .booking_occupancy_wrapper .add_new_occupancy_btn.disabled:focus, + .booking_occupancy_wrapper .add_new_occupancy_btn.disabled:hover { + color: #333; + opacity: 0.5; + cursor: not-allowed;} .booking_occupancy_wrapper .occupancy_info_head { font-size: 14px; color: #333333; diff --git a/themes/hotel-reservation-theme/css/order-opc.css b/themes/hotel-reservation-theme/css/order-opc.css index 560d3ae92..dd4c0756d 100644 --- a/themes/hotel-reservation-theme/css/order-opc.css +++ b/themes/hotel-reservation-theme/css/order-opc.css @@ -409,11 +409,6 @@ font-size: 14px; color: #0000FF; } -#order-opc .avail_vouchers_block .avail_voucher_des { - font-size: 12px; - color: #777777; - margin-bottom: 2px; -} #order-opc .avail_vouchers_block .seperator { margin-top: 10px; margin-bottom: 10px; diff --git a/themes/hotel-reservation-theme/discount.tpl b/themes/hotel-reservation-theme/discount.tpl index 25440cad7..ea4ba715f 100644 --- a/themes/hotel-reservation-theme/discount.tpl +++ b/themes/hotel-reservation-theme/discount.tpl @@ -22,10 +22,10 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} -{capture name=path}{l s='My account'}{$navigationPipe}{l s='My vouchers'}{/capture} +{capture name=path}{l s='My account'}{$navigationPipe}{l s='Vouchers'}{/capture}

    - {l s='My vouchers'} + {l s='Vouchers'}

    {if isset($cart_rules) && $nb_cart_rules} @@ -33,7 +33,7 @@ {l s='Code'} - {l s='Description'} + {l s='Name'} {l s='Quantity'} {l s='Value'} {l s='Minimum'} @@ -98,7 +98,7 @@
  • - {l s='Back to your account'} + {l s='Back to My account'}
    • diff --git a/themes/hotel-reservation-theme/history.tpl b/themes/hotel-reservation-theme/history.tpl index 8135b8fbc..b6eeee269 100644 --- a/themes/hotel-reservation-theme/history.tpl +++ b/themes/hotel-reservation-theme/history.tpl @@ -27,10 +27,10 @@ {l s='My account'} {$navigationPipe} - {l s='Order history'} + {l s='Bookings'} {/capture} {include file="$tpl_dir./errors.tpl"} -

    {l s='Order history'}

    +

    {l s='Bookings'}

    {l s='Here are the orders you\'ve placed since your account was created.'}

    {if $slowValidation}

    {l s='If you have just placed an order, it may take a few minutes for it to be validated. Please refresh this page if your order is missing.'}

    @@ -127,7 +127,7 @@
  • - {l s='Back to Your Account'} + {l s='Back to My account'}
    • diff --git a/themes/hotel-reservation-theme/identity.tpl b/themes/hotel-reservation-theme/identity.tpl index b84a30800..63d5645b5 100644 --- a/themes/hotel-reservation-theme/identity.tpl +++ b/themes/hotel-reservation-theme/identity.tpl @@ -31,12 +31,12 @@ {$navigationPipe} - {l s='Your personal information'} + {l s='Personal information'} {/capture}

    - {l s='Your personal information'} + {l s='Personal information'}

    {include file="$tpl_dir./errors.tpl"} @@ -84,51 +84,53 @@
    -
    - -
    -
    - -
    -
    - {* - {l s='January'} - {l s='February'} - {l s='March'} - {l s='April'} - {l s='May'} - {l s='June'} - {l s='July'} - {l s='August'} - {l s='September'} - {l s='October'} - {l s='November'} - {l s='December'} - *} - -
    -
    - + {if isset($birthday) && $birthday} +
    + +
    +
    + +
    +
    + {* + {l s='January'} + {l s='February'} + {l s='March'} + {l s='April'} + {l s='May'} + {l s='June'} + {l s='July'} + {l s='August'} + {l s='September'} + {l s='October'} + {l s='November'} + {l s='December'} + *} + +
    +
    + +
    -
    + {/if}