diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php index bda5ecd12..6c261e009 100644 --- a/classes/controller/FrontController.php +++ b/classes/controller/FrontController.php @@ -1192,7 +1192,7 @@ class FrontControllerCore extends Controller 'token' => Tools::getToken(), 'priceDisplayPrecision' => _PS_PRICE_DISPLAY_PRECISION_, 'content_only' => (int)Tools::getValue('content_only'), - 'WK_DISPLAY_OUR_HOTEL_TAB_IN_HEADER' => Configuration::get('WK_DISPLAY_OUR_HOTEL_TAB_IN_HEADER'), + 'WK_DISPLAY_PROPERTIES_LINK_IN_HEADER' => Configuration::get('WK_DISPLAY_PROPERTIES_LINK_IN_HEADER'), )); $this->context->smarty->assign($this->initLogoAndFavicon()); diff --git a/controllers/front/ContactController.php b/controllers/front/ContactController.php index ace49d894..731780e78 100644 --- a/controllers/front/ContactController.php +++ b/controllers/front/ContactController.php @@ -286,7 +286,7 @@ class ContactControllerCore extends FrontController $shopAddress = ''; $shopAddress_obj = $objShop->getAddress(); if (isset($shopAddress_obj) && $shopAddress_obj instanceof Address) { - $shopAddress = AddressFormat::generateAddress($shopAddress_obj, array(), ' - ', ' '); + $shopAddress = AddressFormat::generateAddress($shopAddress_obj, array(), ', ', ' '); } $gblHtlAddress = $shopAddress; @@ -317,12 +317,12 @@ class ContactControllerCore extends FrontController $contactKey = md5(uniqid(microtime(), true)); $this->context->cookie->__set('contactFormKey', $contactKey); - $displayHotelMap = Configuration::get('WK_CONTACT_DISPLAY_HOTEL_MAP'); + $displayHotelMap = Configuration::get('WK_DISPLAY_CONTACT_PAGE_GOOLGE_MAP'); $this->context->smarty->assign( array( 'hotelsInfo' => $hotelsInfo, 'viewOnMap' => Configuration::get('WK_GOOGLE_ACTIVE_MAP'), - 'displayHotels' => Configuration::get('WK_CONTACT_DISPLAY_HOTEL_LIST'), + 'displayHotels' => Configuration::get('WK_DISPLAY_CONTACT_PAGE_HOTEL_LIST'), 'gblHtlPhone' => $gblHtlPhone, 'gblHtlEmail' => $gblHtlEmail, 'displayHotelMap' => $displayHotelMap, diff --git a/controllers/front/PropertiesController.php b/controllers/front/OurPropertiesController.php similarity index 82% rename from controllers/front/PropertiesController.php rename to controllers/front/OurPropertiesController.php index 6736c9ac7..cb651ba1b 100644 --- a/controllers/front/PropertiesController.php +++ b/controllers/front/OurPropertiesController.php @@ -21,9 +21,9 @@ * @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0 */ -class PropertiesControllerCore extends FrontController +class OurPropertiesControllerCore extends FrontController { - public $php_self = 'properties'; + public $php_self = 'our-properties'; /** * Assign template vars related to page content @@ -38,29 +38,28 @@ class PropertiesControllerCore extends FrontController $hotelsInfo = array(); $hotelLocationArray = 0; $pageLimit = 0; - $displayHotelMap = Configuration::get('WK_PROPERTIES_DISPLAY_HOTEL_MAP'); + $displayHotelMap = Configuration::get('WK_DISPLAY_PROPERTIES_PAGE_GOOGLE_MAP'); if (Module::isInstalled('hotelreservationsystem') && Module::isEnabled('hotelreservationsystem')) { $objModule = Module::getInstanceByName('hotelreservationsystem'); $objHotelInfo = new HotelBranchInformation(); if ($hotelsInfo = $objHotelInfo->hotelBranchesInfo(false, 1, 1)) { - foreach ($hotelsInfo as &$hotel) { + $hotelIconDefault = $this->context->link->getMediaLink($objModule->getPathUri().'views/img/Slices/hotel-default-icon.png'); + foreach ($hotelsInfo as $hotelKey => $hotel) { if (isset($hotel['id_cover_img']) && $hotel['id_cover_img'] - && Validate::isLoadedObject( - $objHotelImage = new HotelImage($hotel['id_cover_img']) - ) + && Validate::isLoadedObject($objHotelImage = new HotelImage($hotel['id_cover_img'])) ) { $htlImgLink = $this->context->link->getMediaLink($objHotelImage->getImageLink($hotel['id_cover_img'], ImageType::getFormatedName('medium'))); if ((bool)Tools::file_get_contents($htlImgLink)) { - $hotel['image_url'] = $htlImgLink; + $hotelsInfo[$hotelKey]['image_url'] = $htlImgLink; } else { - $hotel['image_url'] = $this->context->link->getMediaLink($objModule->getPathUri().'views/img/Slices/hotel-default-icon.png'); + $hotelsInfo[$hotelKey]['image_url'] = $hotelIconDefault; } } else { - $hotel['image_url'] = $this->context->link->getMediaLink($objModule->getPathUri().'views/img/Slices/hotel-default-icon.png'); + $hotelsInfo[$hotelKey]['image_url'] = $hotelIconDefault; } - $hotel['view_rooms_link'] = $this->context->link->getCategoryLink( + $hotelsInfo[$hotelKey]['view_rooms_link'] = $this->context->link->getCategoryLink( new Category($hotel['id_category'], $this->context->language->id), null, $this->context->language->id @@ -69,10 +68,9 @@ class PropertiesControllerCore extends FrontController // To store max number pages. $pageLimit = ceil(count($hotelsInfo)/10); - - if (!($page = Tools::getValue('pagination'))) { - $page = 1; - } else if (!$pageLimit || ($page > $pageLimit)) { + if (!($page = Tools::getValue('pagination')) + || (!$pageLimit || ($page > $pageLimit)) + ) { $page = 1; } @@ -133,18 +131,18 @@ class PropertiesControllerCore extends FrontController 'viewOnMap' => Configuration::get('WK_GOOGLE_ACTIVE_MAP'), 'displayHotelMap' => $displayHotelMap, 'WK_HTL_SHORT_DESC' => Configuration::get('WK_HTL_SHORT_DESC', $this->context->language->id), - 'currentIndex' => $this->context->link->getPageLink('properties') + 'currentIndex' => $this->context->link->getPageLink('our-properties') ) ); - $this->setTemplate(_PS_THEME_DIR_.'properties.tpl'); + $this->setTemplate(_PS_THEME_DIR_.'our-properties.tpl'); } public function setMedia() { parent::setMedia(); - $this->addJS(_THEME_JS_DIR_.'properties.js'); - $this->addCSS(_THEME_CSS_DIR_.'properties.css'); + $this->addJS(_THEME_JS_DIR_.'our-properties.js'); + $this->addCSS(_THEME_CSS_DIR_.'our-properties.css'); // GOOGLE MAP if (($PS_API_KEY = Configuration::get('PS_API_KEY')) && Configuration::get('WK_GOOGLE_ACTIVE_MAP')) { Media::addJsDef( @@ -152,6 +150,7 @@ class PropertiesControllerCore extends FrontController 'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')), ) ); + $this->addJS( 'https://maps.googleapis.com/maps/api/js?key='.$PS_API_KEY. '&libraries=places&language='.$this->context->language->iso_code.'®ion='.$this->context->country->iso_code diff --git a/install/data/xml/meta.xml b/install/data/xml/meta.xml index baf678639..4c9a0b225 100644 --- a/install/data/xml/meta.xml +++ b/install/data/xml/meta.xml @@ -148,8 +148,8 @@ products-comparison 1 - - properties + + our-properties 1 diff --git a/install/langs/bg/data/meta.xml b/install/langs/bg/data/meta.xml index 75cac4ceb..2cb836a57 100644 --- a/install/langs/bg/data/meta.xml +++ b/install/langs/bg/data/meta.xml @@ -120,11 +120,11 @@ order-follow - + Our Properties - properties + our-properties Credit slip diff --git a/install/langs/bn/data/meta.xml b/install/langs/bn/data/meta.xml index fcab2be9b..57422b652 100644 --- a/install/langs/bn/data/meta.xml +++ b/install/langs/bn/data/meta.xml @@ -126,11 +126,11 @@ order-slip - - আমাদের সম্পত্তি + + আমাদের সম্পত্তিসমূহ - properties + our-properties অর্ডার diff --git a/install/langs/br/data/meta.xml b/install/langs/br/data/meta.xml index c4a4e3040..064e8ab57 100644 --- a/install/langs/br/data/meta.xml +++ b/install/langs/br/data/meta.xml @@ -120,11 +120,11 @@ acompanhar-meu-pedido - - Hon tiez + + Nossas propriedades - properties + our-properties Nota do pedido diff --git a/install/langs/cs/data/meta.xml b/install/langs/cs/data/meta.xml index af7021abc..c566a1a06 100644 --- a/install/langs/cs/data/meta.xml +++ b/install/langs/cs/data/meta.xml @@ -120,11 +120,11 @@ order-follow - + Naše nemovitosti - properties + our-properties Dobropis diff --git a/install/langs/de/data/meta.xml b/install/langs/de/data/meta.xml index 122c98d9f..f79a747c2 100644 --- a/install/langs/de/data/meta.xml +++ b/install/langs/de/data/meta.xml @@ -120,11 +120,11 @@ bestellungsverfolgung - + Unsere Immobilien - properties + our-properties Bestellschein diff --git a/install/langs/en/data/meta.xml b/install/langs/en/data/meta.xml index 6ef63e6ce..531c61efb 100644 --- a/install/langs/en/data/meta.xml +++ b/install/langs/en/data/meta.xml @@ -120,11 +120,11 @@ order-follow - + Our Properties - properties + our-properties Credit slip diff --git a/install/langs/es/data/meta.xml b/install/langs/es/data/meta.xml index aff9d5fd1..ba7665bca 100644 --- a/install/langs/es/data/meta.xml +++ b/install/langs/es/data/meta.xml @@ -120,11 +120,11 @@ seguimiento-pedido - + Nuestras propiedades - properties + our-properties Albarán diff --git a/install/langs/fa/data/meta.xml b/install/langs/fa/data/meta.xml index 61169ac9e..6cccce71b 100644 --- a/install/langs/fa/data/meta.xml +++ b/install/langs/fa/data/meta.xml @@ -120,11 +120,11 @@ order-follow - + املاک ما - properties + our-properties رسید سفارش diff --git a/install/langs/fr/data/meta.xml b/install/langs/fr/data/meta.xml index 7fa6887f3..5939be426 100644 --- a/install/langs/fr/data/meta.xml +++ b/install/langs/fr/data/meta.xml @@ -120,11 +120,11 @@ suivi-commande - + Nos propriétés - properties + our-properties Avoirs diff --git a/install/langs/he/data/meta.xml b/install/langs/he/data/meta.xml index 2f8901f8b..758bcf4fb 100644 --- a/install/langs/he/data/meta.xml +++ b/install/langs/he/data/meta.xml @@ -120,11 +120,11 @@ מעקב-הזמנות - + הנכסים שלנו - properties + our-properties שוברי הזמנה diff --git a/install/langs/hr/data/meta.xml b/install/langs/hr/data/meta.xml index b30583cc6..7057dfacb 100644 --- a/install/langs/hr/data/meta.xml +++ b/install/langs/hr/data/meta.xml @@ -120,11 +120,11 @@ order-follow - - Our hotels + + Our Properties - properties + our-properties Credit slip diff --git a/install/langs/hu/data/meta.xml b/install/langs/hu/data/meta.xml index 645914dfb..8d36562c3 100644 --- a/install/langs/hu/data/meta.xml +++ b/install/langs/hu/data/meta.xml @@ -126,11 +126,11 @@ order-slip - - Our hotels + + Our Properties - properties + our-properties Order diff --git a/install/langs/id/data/meta.xml b/install/langs/id/data/meta.xml index eb35396ec..77819f8cd 100644 --- a/install/langs/id/data/meta.xml +++ b/install/langs/id/data/meta.xml @@ -120,11 +120,11 @@ pantau-order - + Properti kami - properties + our-properties Slip order diff --git a/install/langs/it/data/meta.xml b/install/langs/it/data/meta.xml index 015e87498..22485f8c0 100644 --- a/install/langs/it/data/meta.xml +++ b/install/langs/it/data/meta.xml @@ -126,11 +126,11 @@ buono-ordine - + Le nostre proprietà - properties + our-properties Ordine diff --git a/install/langs/lt/data/meta.xml b/install/langs/lt/data/meta.xml index a540934af..3a18628ef 100644 --- a/install/langs/lt/data/meta.xml +++ b/install/langs/lt/data/meta.xml @@ -120,11 +120,11 @@ order-follow - - Our hotels + + Our Properties - properties + our-properties Credit slip diff --git a/install/langs/mk/data/meta.xml b/install/langs/mk/data/meta.xml index 1ed8250c1..541576642 100644 --- a/install/langs/mk/data/meta.xml +++ b/install/langs/mk/data/meta.xml @@ -120,11 +120,11 @@ order-follow - - Our hotels + + Our Properties - properties + our-properties Order slip diff --git a/install/langs/no/data/meta.xml b/install/langs/no/data/meta.xml index 520a9144c..9fb17959f 100644 --- a/install/langs/no/data/meta.xml +++ b/install/langs/no/data/meta.xml @@ -120,11 +120,11 @@ order-follow - - Our hotels + + Our Properties - properties + our-properties Order slip diff --git a/install/langs/pl/data/meta.xml b/install/langs/pl/data/meta.xml index 69ccaf61d..0934c53e1 100644 --- a/install/langs/pl/data/meta.xml +++ b/install/langs/pl/data/meta.xml @@ -120,11 +120,11 @@ sledzenie-zamowienia - + Nasze nieruchomości - properties + our-properties Pokwitowania diff --git a/install/langs/pt/data/meta.xml b/install/langs/pt/data/meta.xml index 7df1881fe..25504b1e0 100644 --- a/install/langs/pt/data/meta.xml +++ b/install/langs/pt/data/meta.xml @@ -120,11 +120,11 @@ acompanhar-encomenda - + Nossas propriedades - properties + our-properties Nota de Encomenda diff --git a/install/langs/ro/data/meta.xml b/install/langs/ro/data/meta.xml index 2f7d3e2c8..1183e23ba 100644 --- a/install/langs/ro/data/meta.xml +++ b/install/langs/ro/data/meta.xml @@ -120,11 +120,11 @@ returnari - + Proprietățile noastre - properties + our-properties Bon de comandă diff --git a/install/langs/ru/data/meta.xml b/install/langs/ru/data/meta.xml index 9bc9533da..f32b4d38c 100644 --- a/install/langs/ru/data/meta.xml +++ b/install/langs/ru/data/meta.xml @@ -120,11 +120,11 @@ order-follow - + Наши объекты - properties + our-properties Бланк заказа diff --git a/install/langs/si/data/meta.xml b/install/langs/si/data/meta.xml index bd7005158..33e1e78b2 100644 --- a/install/langs/si/data/meta.xml +++ b/install/langs/si/data/meta.xml @@ -120,11 +120,11 @@ order-follow - - Our hotels + + Our Properties - properties + our-properties Credit slip diff --git a/install/langs/sr/data/meta.xml b/install/langs/sr/data/meta.xml index 9b5583bfc..1c68f04c5 100644 --- a/install/langs/sr/data/meta.xml +++ b/install/langs/sr/data/meta.xml @@ -114,11 +114,11 @@ my-account - - Our hotels + + Our Properties - properties + our-properties Order follow diff --git a/install/langs/sv/data/meta.xml b/install/langs/sv/data/meta.xml index 335207a91..0c8036887 100644 --- a/install/langs/sv/data/meta.xml +++ b/install/langs/sv/data/meta.xml @@ -120,11 +120,11 @@ order-follow - - Our hotels + + Our Properties - properties + our-properties Credit slip diff --git a/install/langs/tw/data/meta.xml b/install/langs/tw/data/meta.xml index 6399d418a..c1a2ca7ed 100644 --- a/install/langs/tw/data/meta.xml +++ b/install/langs/tw/data/meta.xml @@ -120,11 +120,11 @@ order-follow - + 我們的物業 - properties + our-properties 訂購單 diff --git a/install/langs/vn/data/meta.xml b/install/langs/vn/data/meta.xml index 485fbd516..69a0bba3d 100644 --- a/install/langs/vn/data/meta.xml +++ b/install/langs/vn/data/meta.xml @@ -120,11 +120,11 @@ order-follow - - Tài sản của chúng tôi + + Các bất động sản của chúng tôi - properties + our-properties Phiếu tín dụng diff --git a/install/langs/zh/data/meta.xml b/install/langs/zh/data/meta.xml index 4b15cc6a6..9fb5a12ce 100644 --- a/install/langs/zh/data/meta.xml +++ b/install/langs/zh/data/meta.xml @@ -120,11 +120,11 @@ order-follow - - Our hotels + + Our Properties - properties + our-properties Order slip diff --git a/modules/blocknavigationmenu/classes/WkCustomNavigationLink.php b/modules/blocknavigationmenu/classes/WkCustomNavigationLink.php index 5346c4320..5911514a4 100644 --- a/modules/blocknavigationmenu/classes/WkCustomNavigationLink.php +++ b/modules/blocknavigationmenu/classes/WkCustomNavigationLink.php @@ -149,37 +149,6 @@ class WkCustomNavigationLink extends ObjectModel public function insertDemoData($populateData = null) { - //insert home link to the list - $languages = Language::getLanguages(false); - $objCustomNavigationLink = new WkCustomNavigationLink(); - foreach ($languages as $language) { - $objCustomNavigationLink->name[$language['id_lang']] = 'Home'; - } - $objCustomNavigationLink->position = $this->getHigherPosition(); - $objCustomNavigationLink->id_cms = 0; - $objCustomNavigationLink->show_at_navigation = 1; - $objCustomNavigationLink->show_at_footer = 0; - $objCustomNavigationLink->active = 1; - $objCustomNavigationLink->is_custom_link = 0; - $objCustomNavigationLink->link = 'index'; - $objCustomNavigationLink->save(); - - $objCustomNavigationLink = new WkCustomNavigationLink(); - foreach ($languages as $language) { - $objCustomNavigationLink->name[$language['id_lang']] = 'Our hotels'; - } - - $https_link = (Tools::usingSecureMode() && Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://'; - $objLink = new Link($https_link, $https_link); - $objCustomNavigationLink->position = $this->getHigherPosition(); - $objCustomNavigationLink->id_cms = 0; - $objCustomNavigationLink->show_at_navigation = 1; - $objCustomNavigationLink->show_at_footer = 0; - $objCustomNavigationLink->active = 1; - $objCustomNavigationLink->link = $objLink->getPageLink('properties'); - $objCustomNavigationLink->is_custom_link = 1; - $objCustomNavigationLink->save(); - // enter modules links $modsElems = array(); // if module is installing or resetting @@ -206,51 +175,86 @@ class WkCustomNavigationLink extends ObjectModel } } + //insert home link to the list + $languages = Language::getLanguages(false); + $https_link = (Tools::usingSecureMode() && Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://'; + $objLink = new Link($https_link, $https_link); + + $navigationLinks = array( + array( + 'name' => 'Home', + 'id_cms' => 0, + 'show_at_navigation' => 1, + 'show_at_footer' => 0, + 'is_custom_link' => 0, + 'link' => 'index', + ), + array( + 'name' => 'Our Properties', + 'id_cms' => 0, + 'show_at_navigation' => 1, + 'show_at_footer' => 0, + 'is_custom_link' => 1, + 'link' => $objLink->getPageLink('our-properties'), + ), + ); + if ($modsElems) { $indexLink = Context::getContext()->shop->getBaseURI(); foreach ($modsElems as $name => $modElm) { - $objCustomNavigationLink = new WkCustomNavigationLink(); - foreach ($languages as $language) { - $objCustomNavigationLink->name[$language['id_lang']] = $name; - } - $objCustomNavigationLink->position = $this->getHigherPosition(); - $objCustomNavigationLink->id_cms = 0; - $objCustomNavigationLink->show_at_navigation = 1; - $objCustomNavigationLink->show_at_footer = 0; - $objCustomNavigationLink->active = 1; - $objCustomNavigationLink->link = $indexLink.'#'.$modElm; - $objCustomNavigationLink->is_custom_link = 1; - $objCustomNavigationLink->save(); + $navigationLinks[] = array( + 'name' => $name, + 'id_cms' => 0, + 'show_at_navigation' => 1, + 'show_at_footer' => 0, + 'is_custom_link' => 1, + 'link' => $indexLink.'#'.$modElm + ); } } + // enter CMS pages data if ($cmsPagesCMS = CMS::getCMSPages(Configuration::get('PS_LANG_DEFAULT'), 1)) { $showAtNavigation = 0; foreach ($cmsPagesCMS as $cmsPage) { - $objCustomNavigationLink = new WkCustomNavigationLink(); - $objCustomNavigationLink->position = $this->getHigherPosition(); - $objCustomNavigationLink->id_cms = $cmsPage['id_cms']; - $objCustomNavigationLink->show_at_navigation = $showAtNavigation; - $objCustomNavigationLink->show_at_footer = 1; - $objCustomNavigationLink->active = 1; - $objCustomNavigationLink->is_custom_link = 0; - $objCustomNavigationLink->save(); + $navigationLinks[] = array( + 'id_cms' => $cmsPage['id_cms'], + 'show_at_navigation' => $showAtNavigation, + 'show_at_footer' => 1, + 'is_custom_link' => 0, + ); $showAtNavigation = !$showAtNavigation; } } - //insert contact link to the list - $objCustomNavigationLink = new WkCustomNavigationLink(); - foreach ($languages as $language) { - $objCustomNavigationLink->name[$language['id_lang']] = 'Contact Us'; + + $navigationLinks[] = array( + 'name' => 'Contact Us', + 'id_cms' => 0, + 'show_at_navigation' => 1, + 'show_at_footer' => 0, + 'is_custom_link' => 0, + 'link' => 'contact', + ); + foreach ($navigationLinks as $navigationLink) { + $objCustomNavigationLink = new WkCustomNavigationLink(); + if (isset($navigationLink['name'])) { + foreach ($languages as $language) { + $objCustomNavigationLink->name[$language['id_lang']] = $navigationLink['name']; + } + } + + $objCustomNavigationLink->position = $this->getHigherPosition(); + $objCustomNavigationLink->id_cms = $navigationLink['id_cms']; + $objCustomNavigationLink->show_at_navigation = $navigationLink['show_at_navigation']; + $objCustomNavigationLink->show_at_footer = $navigationLink['show_at_footer']; + $objCustomNavigationLink->active = 1; + if (isset($navigationLink['link'])) { + $objCustomNavigationLink->link = $navigationLink['link']; + } + + $objCustomNavigationLink->is_custom_link = $navigationLink['is_custom_link']; + $objCustomNavigationLink->save(); } - $objCustomNavigationLink->position = $this->getHigherPosition(); - $objCustomNavigationLink->id_cms = 0; - $objCustomNavigationLink->show_at_navigation = 1; - $objCustomNavigationLink->show_at_footer = 0; - $objCustomNavigationLink->active = 1; - $objCustomNavigationLink->is_custom_link = 0; - $objCustomNavigationLink->link = 'contact'; - $objCustomNavigationLink->save(); return true; } diff --git a/modules/blockuserinfo/nav.tpl b/modules/blockuserinfo/nav.tpl index ffd9f239d..8b124e6f5 100644 --- a/modules/blockuserinfo/nav.tpl +++ b/modules/blockuserinfo/nav.tpl @@ -48,11 +48,6 @@ {/if} {if !isset($ajaxCustomerLogin)} - {if isset($WK_DISPLAY_OUR_HOTEL_TAB_IN_HEADER) && $WK_DISPLAY_OUR_HOTEL_TAB_IN_HEADER} - - {/if} {/if} {/block} diff --git a/modules/hotelreservationsystem/classes/HotelHelper.php b/modules/hotelreservationsystem/classes/HotelHelper.php index 168477269..05d066e7e 100644 --- a/modules/hotelreservationsystem/classes/HotelHelper.php +++ b/modules/hotelreservationsystem/classes/HotelHelper.php @@ -1050,7 +1050,7 @@ class HotelHelper Configuration::updateValue('WK_CUSTOMER_SUPPORT_PHONE_NUMBER', '0987654321'); Configuration::updateValue('WK_CUSTOMER_SUPPORT_EMAIL', 'hotelprime@htl.com'); - Configuration::updateValue('WK_CONTACT_DISPLAY_HOTEL_LIST', 0); + Configuration::updateValue('WK_DISPLAY_CONTACT_PAGE_HOTEL_LIST', 0); Configuration::updateValue('WK_TITLE_HEADER_BLOCK', $home_banner_default_title); Configuration::updateValue('WK_CONTENT_HEADER_BLOCK', $home_banner_default_content); diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php index c4018fe58..ca6e55912 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php @@ -40,6 +40,17 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController } $hotelNameDisable = (count($hotelsInfo) > 1 ? true : false); $locationDisable = ((count($hotelsInfo) < 2) && !Configuration::get('WK_HOTEL_NAME_ENABLE')) ? true : false; + + $countryList = array(); + $countryList[] = array('id' => '0', 'name' => $this->l('Choose your country')); + foreach (Country::getCountries($this->context->language->id) as $country) { + $countryList[] = array('id' => $country['id_country'], 'name' => $country['name']); + } + $stateList = array(); + $stateList[] = array('id' => '0', 'name' => $this->l('Choose your state (if applicable)')); + foreach (State::getStates($this->context->language->id) as $state) { + $stateList[] = array('id' => $state['id_state'], 'name' => $state['name']); + } $this->fields_options = array( 'hotelsearchpanel' => array( 'icon' => 'icon-search', @@ -147,23 +158,6 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController 'identifier' => 'id', 'list' => $hotelsInfo, ), - 'WK_DISPLAY_OUR_HOTEL_TAB_IN_HEADER' => array( - 'title' => $this->l('Display "Our Hotels" tab in menu'), - 'cast' => 'intval', - 'type' => 'bool', - 'default' => '0', - 'values' => array( - array( - 'id' => 'active_on', - 'value' => 1, - ), - array( - 'id' => 'active_off', - 'value' => 0, - ), - ), - 'hint' => $this->l('Display "Our Hotels" tab in menu in top in the front office'), - ), 'WK_HTL_ESTABLISHMENT_YEAR' => array( 'title' => $this->l('Website Launch Year'), 'hint' => $this->l('The year when your hotel site was launched.'), @@ -178,6 +172,40 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController 'name' => 'WK_HOTEL_HEADER_IMAGE', 'url' => _PS_IMG_, ), + 'WK_DISPLAY_PROPERTIES_LINK_IN_HEADER' => array( + 'title' => $this->l('Display Our Properties link in Header'), + 'cast' => 'intval', + 'type' => 'bool', + 'default' => '0', + 'values' => array( + array( + 'id' => 'active_on', + 'value' => 1, + ), + array( + 'id' => 'active_off', + 'value' => 0, + ), + ), + 'hint' => $this->l('Display Our Properties link in header in the front office'), + ), + 'WK_DISPLAY_CONTACT_PAGE_HOTEL_LIST' => array( + 'title' => $this->l('Display Contact Page Hotel List'), + 'cast' => 'intval', + 'type' => 'bool', + 'default' => '0', + 'values' => array( + array( + 'id' => 'active_on', + 'value' => 1, + ), + array( + 'id' => 'active_off', + 'value' => 0, + ), + ), + 'hint' => $this->l('Enable to display hotels list on the contact us page.'), + ), ), 'submit' => array('title' => $this->l('Save')), ), @@ -197,23 +225,6 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController 'hint' => $this->l('The email used for customer service. It will be shown on navigation bar.'), 'class' => 'fixed-width-xxl', ), - 'WK_CONTACT_DISPLAY_HOTEL_LIST' => array( - 'title' => $this->l('Display Hotels On Contact Page'), - 'cast' => 'intval', - 'type' => 'bool', - 'default' => '0', - 'values' => array( - array( - 'id' => 'active_on', - 'value' => 1, - ), - array( - 'id' => 'active_off', - 'value' => 0, - ), - ), - 'hint' => $this->l('Enable to display hotels list on the contact us page.'), - ), ), 'submit' => array( 'title' => $this->l('Save'), @@ -222,7 +233,83 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController 'websitedetail' => array( 'title' => $this->l('Website Contact Details'), 'icon' => 'icon-user', - 'fields' => $this->_getDefaultFieldsContent(), + 'fields' => array( + 'PS_SHOP_NAME' => array( + 'title' => $this->l('Website name'), + 'hint' => $this->l('Displayed in emails and page titles.'), + 'validation' => 'isGenericName', + 'required' => true, + 'type' => 'text', + 'no_escape' => true, + ), + 'PS_SHOP_EMAIL' => array( + 'title' => $this->l('Website email'), + 'hint' => $this->l('Displayed in emails sent to customers and on Contact Us page.'), + 'validation' => 'isEmail', + 'required' => true, + 'type' => 'text' + ), + 'PS_SHOP_PHONE' => array( + 'title' => $this->l('Phone'), + 'validation' => 'isGenericName', + 'required' => true, + 'type' => 'text', + 'hint' => $this->l('The phone number of the main branch.'), + ), + 'PS_SHOP_ADDR1' => array( + 'title' => $this->l('Address line 1'), + 'validation' => 'isAddress', + 'type' => 'text', + 'hint' => $this->l('The address of the main branch.'), + 'isCleanHtml' => true, + 'required' => true, + ), + 'PS_SHOP_ADDR2' => array( + 'title' => $this->l('Address line 2'), + 'validation' => 'isAddress', + 'type' => 'text' + ), + 'PS_SHOP_CODE' => array( + 'title' => $this->l('Zip/postal code'), + 'validation' => 'isGenericName', + 'type' => 'text' + ), + 'PS_SHOP_CITY' => array( + 'title' => $this->l('City'), + 'validation' => 'isGenericName', + 'type' => 'text' + ), + 'PS_SHOP_COUNTRY_ID' => array( + 'title' => $this->l('Country'), + 'validation' => 'isInt', + 'type' => 'select', + 'list' => $countryList, + 'identifier' => 'id', + 'cast' => 'intval', + 'defaultValue' => (int)$this->context->country->id + ), + 'PS_SHOP_STATE_ID' => array( + 'title' => $this->l('State'), + 'validation' => 'isInt', + 'type' => 'select', + 'list' => $stateList, + 'identifier' => 'id', + 'cast' => 'intval' + ), + 'PS_SHOP_DETAILS' => array( + 'title' => $this->l('Registration number'), + 'hint' => $this->l('Website registration information (e.g. SIRET or RCS).'), + 'validation' => 'isGenericName', + 'type' => 'textarea', + 'cols' => 30, + 'rows' => 5 + ), + 'PS_SHOP_FAX' => array( + 'title' => $this->l('Fax'), + 'validation' => 'isGenericName', + 'type' => 'text' + ), + ), 'submit' => array( 'title' => $this->l('Save'), ), @@ -344,8 +431,8 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController ), 'hint' => $this->l('If yes, only active hotels will be displayed on map.'), ), - 'WK_PROPERTIES_DISPLAY_HOTEL_MAP' => array( - 'title' => $this->l('Display Hotels Map On Properties Page'), + 'WK_DISPLAY_PROPERTIES_PAGE_GOOGLE_MAP' => array( + 'title' => $this->l('Display Our Properties page Google map'), 'cast' => 'intval', 'type' => 'bool', 'default' => '0', @@ -359,10 +446,10 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController 'value' => 0, ), ), - 'hint' => $this->l('Enable to display map with hotels locations on the properties page.'), + 'hint' => $this->l('Enable to display map with hotels locations on the our properties page.'), ), - 'WK_CONTACT_DISPLAY_HOTEL_MAP' => array( - 'title' => $this->l('Display Hotels Map On Contact Page'), + 'WK_DISPLAY_CONTACT_PAGE_GOOLGE_MAP' => array( + 'title' => $this->l('Display Contact Us page Google map'), 'cast' => 'intval', 'type' => 'bool', 'default' => '0', @@ -387,101 +474,6 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController } - protected function _getDefaultFieldsContent() - { - $this->context = Context::getContext(); - $countryList = array(); - $countryList[] = array('id' => '0', 'name' => $this->l('Choose your country')); - foreach (Country::getCountries($this->context->language->id) as $country) { - $countryList[] = array('id' => $country['id_country'], 'name' => $country['name']); - } - $stateList = array(); - $stateList[] = array('id' => '0', 'name' => $this->l('Choose your state (if applicable)')); - foreach (State::getStates($this->context->language->id) as $state) { - $stateList[] = array('id' => $state['id_state'], 'name' => $state['name']); - } - - $formFields = array( - 'PS_SHOP_NAME' => array( - 'title' => $this->l('Website name'), - 'hint' => $this->l('Displayed in emails and page titles.'), - 'validation' => 'isGenericName', - 'required' => true, - 'type' => 'text', - 'no_escape' => true, - ), - 'PS_SHOP_EMAIL' => array( - 'title' => $this->l('Website email'), - 'hint' => $this->l('Displayed in emails sent to customers and on Contact Us page.'), - 'validation' => 'isEmail', - 'required' => true, - 'type' => 'text' - ), - 'PS_SHOP_PHONE' => array( - 'title' => $this->l('Phone'), - 'validation' => 'isGenericName', - 'required' => true, - 'type' => 'text', - 'hint' => $this->l('The phone number of the main branch.'), - ), - 'PS_SHOP_ADDR1' => array( - 'title' => $this->l('Address line 1'), - 'validation' => 'isAddress', - 'type' => 'text', - 'hint' => $this->l('The address of the main branch.'), - 'isCleanHtml' => true, - 'required' => true, - ), - 'PS_SHOP_ADDR2' => array( - 'title' => $this->l('Address line 2'), - 'validation' => 'isAddress', - 'type' => 'text' - ), - 'PS_SHOP_CODE' => array( - 'title' => $this->l('Zip/postal code'), - 'validation' => 'isGenericName', - 'type' => 'text' - ), - 'PS_SHOP_CITY' => array( - 'title' => $this->l('City'), - 'validation' => 'isGenericName', - 'type' => 'text' - ), - 'PS_SHOP_COUNTRY_ID' => array( - 'title' => $this->l('Country'), - 'validation' => 'isInt', - 'type' => 'select', - 'list' => $countryList, - 'identifier' => 'id', - 'cast' => 'intval', - 'defaultValue' => (int)$this->context->country->id - ), - 'PS_SHOP_STATE_ID' => array( - 'title' => $this->l('State'), - 'validation' => 'isInt', - 'type' => 'select', - 'list' => $stateList, - 'identifier' => 'id', - 'cast' => 'intval' - ), - 'PS_SHOP_DETAILS' => array( - 'title' => $this->l('Registration number'), - 'hint' => $this->l('Website registration information (e.g. SIRET or RCS).'), - 'validation' => 'isGenericName', - 'type' => 'textarea', - 'cols' => 30, - 'rows' => 5 - ), - 'PS_SHOP_FAX' => array( - 'title' => $this->l('Fax'), - 'validation' => 'isGenericName', - 'type' => 'text' - ), - ); - - return $formFields; - } - public function beforeUpdateOptions() { if (isset($_POST['PS_SHOP_STATE_ID']) && $_POST['PS_SHOP_STATE_ID'] != '0') { diff --git a/modules/hotelreservationsystem/hotelreservationsystem.php b/modules/hotelreservationsystem/hotelreservationsystem.php index 2b56dd0c6..acbfbe7f2 100644 --- a/modules/hotelreservationsystem/hotelreservationsystem.php +++ b/modules/hotelreservationsystem/hotelreservationsystem.php @@ -695,7 +695,7 @@ class HotelReservationSystem extends Module 'WK_HOTEL_NAME_ENABLE', 'WK_CUSTOMER_SUPPORT_PHONE_NUMBER', 'WK_CUSTOMER_SUPPORT_EMAIL', - 'WK_CONTACT_DISPLAY_HOTEL_LIST' + 'WK_DISPLAY_CONTACT_PAGE_HOTEL_LIST' ); foreach ($configKeys as $key) { if (!Configuration::deleteByName($key)) { diff --git a/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js b/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js index 47de743b7..5e4294a1c 100644 --- a/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js +++ b/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js @@ -835,12 +835,12 @@ function toggleGoogleMapsFields() { if ($('#WK_GOOGLE_ACTIVE_MAP_on').attr('checked') == 'checked') { $('#conf_id_WK_MAP_HOTEL_ACTIVE_ONLY').parent().show(); - $('#conf_id_WK_CONTACT_DISPLAY_HOTEL_MAP').parent().show(); - $('#conf_id_WK_PROPERTIES_DISPLAY_HOTEL_MAP').parent().show(); + $('#conf_id_WK_DISPLAY_CONTACT_PAGE_GOOLGE_MAP').parent().show(); + $('#conf_id_WK_DISPLAY_PROPERTIES_PAGE_GOOGLE_MAP').parent().show(); } else { $('#conf_id_WK_MAP_HOTEL_ACTIVE_ONLY').parent().hide(); - $('#conf_id_WK_CONTACT_DISPLAY_HOTEL_MAP').parent().hide(); - $('#conf_id_WK_PROPERTIES_DISPLAY_HOTEL_MAP').parent().hide(); + $('#conf_id_WK_DISPLAY_CONTACT_PAGE_GOOLGE_MAP').parent().hide(); + $('#conf_id_WK_DISPLAY_PROPERTIES_PAGE_GOOGLE_MAP').parent().hide(); } } diff --git a/modules/hotelreservationsystem/views/templates/admin/hotel_general_settings/helpers/index.php b/modules/hotelreservationsystem/views/templates/admin/hotel_general_settings/helpers/index.php new file mode 100644 index 000000000..dd2519dc2 --- /dev/null +++ b/modules/hotelreservationsystem/views/templates/admin/hotel_general_settings/helpers/index.php @@ -0,0 +1,33 @@ + + function ajaxStoreStates(id_state_selected) { + $.ajax({ + url: "index.php", + cache: false, + data: "ajax=1&tab=AdminStates&token={getAdminToken tab='AdminStates'}&action=states&id_country="+$('#PS_SHOP_COUNTRY_ID').val() + "&id_state=" + $('#PS_SHOP_STATE_ID').val(), + success: function(html) + { + if (html == 'false') { + $("#conf_id_PS_SHOP_STATE_ID").parent().fadeOut(); + $('#PS_SHOP_STATE_ID option[value=0]').attr("selected", "selected"); + } else { + $("#PS_SHOP_STATE_ID").html(html); + $("#conf_id_PS_SHOP_STATE_ID").parent().fadeIn(); + $('#PS_SHOP_STATE_ID option[value=' + id_state_selected + ']').attr("selected", "selected"); + } + } + }); + } + + $(document).ready(function() { + {if isset($categoryData.fields.PS_SHOP_STATE_ID.value)} + if ($('#PS_SHOP_COUNTRY_ID') && $('#PS_SHOP_STATE_ID')) { + ajaxStoreStates({$categoryData.fields.PS_SHOP_STATE_ID.value}); + $('#PS_SHOP_COUNTRY_ID').change(function() { + ajaxStoreStates(); + }); + } + {/if} + }); + + {/if} +{/block} diff --git a/modules/hotelreservationsystem/views/templates/admin/hotel_general_settings/index.php b/modules/hotelreservationsystem/views/templates/admin/hotel_general_settings/index.php new file mode 100644 index 000000000..dd2519dc2 --- /dev/null +++ b/modules/hotelreservationsystem/views/templates/admin/hotel_general_settings/index.php @@ -0,0 +1,33 @@ + +
diff --git a/themes/hotel-reservation-theme/css/contact-form.css b/themes/hotel-reservation-theme/css/contact-form.css index 7e6ee9769..5ffae05e0 100644 --- a/themes/hotel-reservation-theme/css/contact-form.css +++ b/themes/hotel-reservation-theme/css/contact-form.css @@ -274,9 +274,3 @@ outline: none; color: #427fed; } -.margin-bottom-30 { - margin-bottom: 30px; -} -.margin-top-30 { - margin-top: 30px; -} \ No newline at end of file diff --git a/themes/hotel-reservation-theme/css/global.css b/themes/hotel-reservation-theme/css/global.css index cd790b7c6..76406880b 100644 --- a/themes/hotel-reservation-theme/css/global.css +++ b/themes/hotel-reservation-theme/css/global.css @@ -9144,4 +9144,9 @@ a.link { font-weight: 700; color: #0000ff; text-decoration: none; -} \ No newline at end of file +} + +div a.our_properties_link{ + color: #fff; + font-size: 17px; + font-weight: 400;} diff --git a/themes/hotel-reservation-theme/css/modules/blockuserinfo/blockuserinfo.css b/themes/hotel-reservation-theme/css/modules/blockuserinfo/blockuserinfo.css index 979d70364..e97d787ca 100644 --- a/themes/hotel-reservation-theme/css/modules/blockuserinfo/blockuserinfo.css +++ b/themes/hotel-reservation-theme/css/modules/blockuserinfo/blockuserinfo.css @@ -37,11 +37,6 @@ #user_info_acc span.caret { border-top-color: #fff; } -div.our_hotel_tab a{ - color: #fff; - font-size: 17px; - font-weight: 400;} - @media (max-width: 450px) { .hide_xs { display: none; } diff --git a/themes/hotel-reservation-theme/css/our-properties.css b/themes/hotel-reservation-theme/css/our-properties.css new file mode 100644 index 000000000..efc8c340a --- /dev/null +++ b/themes/hotel-reservation-theme/css/our-properties.css @@ -0,0 +1,149 @@ +/** +* NOTICE OF LICENSE +* +* This source file is subject to the Open Software License version 3.0 +* that is bundled with this package in the file LICENSE.md +* It is also available through the world-wide-web at this URL: +* https://opensource.org/license/osl-3-0-php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to support@qloapps.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade this module to a newer +* versions in the future. If you wish to customize this module for your needs +* please refer to https://store.webkul.com/customisation-guidelines for more information. +* +* @author Webkul IN +* @copyright Since 2010 Webkul +* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0 +*/ + +.htl-img { + max-width: 200px;} +.properties-page { + padding: 10px;} +.page-heading { + font-size: 32px;} +.empty-properties-container{ + margin: 30px;} +.our-properties-header { + font-size: 42px; + color: rgba(0, 0, 0, 1); + text-align: center; + font-weight: 300;} +.our-properties-desc { + font-size: 16px; + color: rgba(0, 0, 0, 1); + text-align: center; + font-weight: 300; + line-height: 30px;} +.properties-page .hotels-container { + display: flex; + flex-wrap: wrap; + justify-content: flex-start;} +.hotels-container .hotel-header { + margin-bottom: 40px; + text-align: center;} +.hotels-container .hotel-header>span { + font-size: 30px; + font-weight: 400; + color: rgba(0, 0, 0, 1); + border-bottom: 1px solid rgba(0, 0, 0, 1);} +.properties-page .hotel-address-container { + border-radius: 4px; + box-shadow: 2px 2px 15px 3px rgba(0,0,0,.1); + float: left; + padding: 15px 0px; + width: 100%;} +.hotel-address-container .hotel-name { + font-size: 18px; + font-weight: 400; + color: rgba(0, 0, 0, 1); + margin-bottom: 15px;} +.hotel-address-container span.htl-address-icon { + background-image: url(../../../modules/hotelreservationsystem/views/img/Slices/icon-contact.png);} +.hotel-address-container img.htl-img { + border-radius: 6px;} +.empty-properties-image-container { + background-image: url(../../../modules/hotelreservationsystem/views/img/Slices/no-hotel.png) ; + background-repeat:no-repeat; + background-position: center center; + padding: 200px 0px 10px 0px; + display: block;} +.hotel-address-container span.htl-phone-icon { + background-image: url(../../../modules/hotelreservationsystem/views/img/Slices/icon-contact.png); + padding: 1px 15px 0px 2px; + background-position: 37px; + margin-right: 5px; + font-size: 14px;} +.hotel-address-container span.htl-email-icon { + padding: 1px 10px 1px; + background-position: 19px; + margin-right: 5px;} +span.htl-map-icon { + background-image: url(../../../modules/hotelreservationsystem/views/img/Slices/icon-contact.png); + padding: 1px 20px 0px 0px; + background-position: 0px 0px; + margin-right: 5px; + font-size: 14px;} +.view_rooms_btn, .htl-map-direction-btn { + border-radius: 4px; + padding: 10px 12px; + text-transform: uppercase;} +.htl-map-direction-btn{ + background-color: #DEDEDE; + color: #333333; } +.view_rooms_btn { + background-color: #1292FF; + border-color: #1292FF; + font-weight: 600;} +.view_rooms_btn:hover { + background-color: #3c89cb; + border-color: #3a75a7;} +.pagination-container { + text-align: center;} +.hotel-branch-info-actions{ + display: flex; + gap: 10px;} +.pagination-container .pagination > li > a, .pagination-container .pagination > li > span { + border: unset;} +.pagination-container .pagination > li .active { + border: 1px solid #333333; + border-radius: 12px; + z-index: 10;} +.hotel-address-container p.hotel-branch-info-value { + font-size: 14px; + color: rgba(0, 0, 0, 1); + font-weight: 400; + line-height: 25px;} +.hotel-address-container .htl-map-direction-btn span { + font-size: 12px; + color: rgba(0, 0, 0, 1); + font-weight: 400;} + +@media screen and (max-width: 726px) { + .hotel-branch-info-actions{ + flex-direction: column;} +} + + /* ==== google map ==== */ +#googleMapWrapper { + clear: both; + height: 500px;} +#map { + width: 100%; + height: 100%;} +#map .view-link { + padding-top: 4px;} +.gm-btn-get-directions { + text-decoration: none; + color: #427fed; + font-weight: bold;} +.gm-btn-get-directions:hover { + text-decoration: underline; + color: #427fed;} +.gm-btn-get-directions:focus { + outline: none; + color: #427fed;} diff --git a/themes/hotel-reservation-theme/css/properties.css b/themes/hotel-reservation-theme/css/properties.css deleted file mode 100644 index c96b81421..000000000 --- a/themes/hotel-reservation-theme/css/properties.css +++ /dev/null @@ -1,286 +0,0 @@ -/** -* NOTICE OF LICENSE -* -* This source file is subject to the Open Software License version 3.0 -* that is bundled with this package in the file LICENSE.md -* It is also available through the world-wide-web at this URL: -* https://opensource.org/license/osl-3-0-php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to support@qloapps.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade this module to a newer -* versions in the future. If you wish to customize this module for your needs -* please refer to https://store.webkul.com/customisation-guidelines for more information. -* -* @author Webkul IN -* @copyright Since 2010 Webkul -* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0 -*/ - -.margin-top-50 { - margin-top: 50px; -} -.margin-bottom-30 { - margin-bottom: 30px; -} -.margin-bottom-20 { - margin-bottom: 20px; -} -.margin-top-20 { - margin-top: 20px; -} -.htl-contact-page { - padding: 10px; -} -.page-heading { - font-size: 32px; -} -.empty-properties-container{ - margin: 30px; -} -.htl-contact-page .contact-header { - font-size: 42px; - color: rgba(0, 0, 0, 1); - text-align: center; - font-weight: 300; - margin-bottom: 20px; -} -.htl-contact-page .contact-desc { - font-size: 16px; - color: rgba(0, 0, 0, 1); - text-align: center; - font-weight: 300; - margin-bottom: 20px; - line-height: 30px; -} -.htl-contact-page .contact-form-box { - padding: 30px; - border-radius: 4px; - box-shadow: 2px 2px 15px 3px rgba(0,0,0,.1); -} -.htl-contact-page .contact-form-box .control-label { - font-size: 14px; - color: rgba(0, 0, 0, 1); - font-weight: 400; -} -.htl-contact-page .contact-form-box .form-control, .htl-contact-page .uploader span.filename { - border: 1px solid rgba(0, 0, 0, 1); - font-size: 14px; - color: rgba(0, 0, 0, 1); - font-weight: 400; -} -.htl-contact-page .uploader span.filename { - font-size: 12px; -} -.htl-contact-page .contact-form-box #contact_type { - width: 90%; - text-align: left; -} -.title-container { - margin-left: 150px; - margin-right: 150px; - color: #333333;} -.htl-contact-page .contact_type_ul { - font-size: 14px; - font-weight: 400; - top: 45px; - padding: 0px; - width: 100%; - border-bottom: 1px solid rgba(0, 0, 0, 1); - border-left: 1px solid rgba(0, 0, 0, 1); - border-right: 1px solid rgba(0, 0, 0, 1); - max-height: 145px; - overflow-y: auto; -} -.htl-contact-page .contact_type_ul li { - cursor: default; - font-size: 14px; - color: rgba(0, 0, 0, 1); - font-weight: 400; - padding: 11px; -} -.htl-contact-page .contact_type_ul li:hover, .htl-contact-page .contact_type_ul li:focus, .htl-contact-page .contact_type_ul li:active { - background-color: #379bf0; - color: #FFFFFF; -} -.htl-contact-page .contact_btn { - font-size: 14px; - color: rgba(255, 255, 255, 1); - font-weight: 600; - text-transform: uppercase; - border-radius: 4px; - padding: 0 20px; -} -.htl-contact-page .global-address-header { - font-weight: 400; - font-size: 12px; - color: rgba(0, 0, 0, .6); - text-transform: uppercase; - margin-bottom: 5px; -} -.htl-contact-page .global-address-value { - font-weight: 400; - font-size: 14px; - margin-bottom: 10px; - color: rgba(0, 0, 0, 1); - line-height: 22px; -} -.htl-contact-page .htl-global-address-div { - padding: 20px; - border-radius: 4px; - margin-bottom: 10px; - box-shadow: 2px 2px 15px 3px rgba(0,0,0,.1); -} -@media screen and (min-width: 767px) { - .htl-contact-page .htl-global-address-div { - margin-top: 60px; - } -} -.htl-contact-page .hotels-container { - display: flex; - flex-wrap: wrap; - justify-content: flex-start; -} -.hotels-container .hotel-header { - margin-bottom: 40px; - text-align: center; -} -.hotels-container .hotel-header>span { - font-size: 30px; - font-weight: 400; - color: rgba(0, 0, 0, 1); - border-bottom: 1px solid rgba(0, 0, 0, 1); -} -.htl-contact-page span.action { - background:#379bf0!important; -} -.htl-contact-page .hotel-address-container { - border-radius: 4px; - box-shadow: 2px 2px 15px 3px rgba(0,0,0,.1); - float: left; - padding: 15px 0px; - width: 100%; -} -.htl-contact-page .hotel-city-container>span { - font-size: 20px; - font-weight: 400; - color: rgba(0, 0, 0, 1); -} -.hotel-address-container .hotel-name { - font-size: 18px; - font-weight: 400; - color: rgba(0, 0, 0, 1); - margin-bottom: 15px; -} -.hotel-address-container span.htl-address-icon { - background-image: url(../../../modules/hotelreservationsystem/views/img/Slices/icon-contact.png); -} -.hotel-address-container img.htl-img { - border-radius: 6px; -} -.empty-properties-image-container { - background-image: url(../../../modules/hotelreservationsystem/views/img/Slices/no-hotel.png) ; - background-repeat:no-repeat; - background-position: center center; - padding: 200px 0px 10px 0px; - display: block; -} -.hotel-address-container span.htl-phone-icon { - background-image: url(../../../modules/hotelreservationsystem/views/img/Slices/icon-contact.png); - padding: 1px 15px 0px 2px; - background-position: 37px; - margin-right: 5px; - font-size: 14px; -} -.hotel-address-container span.htl-email-icon { - padding: 1px 10px 1px; - background-position: 19px; - margin-right: 5px; -} -.htl-contact-page .hotel-city-container { - margin-bottom: 10px; -} -span.htl-map-icon { - background-image: url(../../../modules/hotelreservationsystem/views/img/Slices/icon-contact.png); - padding: 1px 20px 0px 0px; - background-position: 0px 0px; - margin-right: 5px; - font-size: 14px; -} -.view_rooms_btn, .htl-map-direction-btn { - border-radius: 4px; - padding: 10px 12px; - text-transform: uppercase; -} - -.htl-map-direction-btn{ - background-color: #DEDEDE; - color: #333333; -} -.view_rooms_btn { - background-color: #1292FF; - border-color: #1292FF; - font-weight: 600; -} -.view_rooms_btn:hover { - background-color: #3c89cb; - border-color: #3a75a7; -} -.pagination-container { - text-align: center; -} -.hotel-branch-info-actions{ - display: flex; - gap: 10px; -} -.pagination-container .pagination > li > a, .pagination-container .pagination > li > span { - border: unset; -} -.pagination-container .pagination > li .active { - border: 1px solid #333333; - border-radius: 12px; - z-index: 10; -} -.hotel-address-container p.hotel-branch-info-value { - font-size: 14px; - color: rgba(0, 0, 0, 1); - font-weight: 400; - line-height: 25px; -} -.hotel-address-container .htl-map-direction-btn span { - font-size: 12px; - color: rgba(0, 0, 0, 1); - font-weight: 400; -} -/* ==== google map ==== */ -#googleMapWrapper { - clear: both; - height: 500px; -} -#map { - width: 100%; - height: 100%; -} - -#map .view-link { - padding-top: 4px; -} - -.gm-btn-get-directions { - text-decoration: none; - color: #427fed; - font-weight: bold; -} - -.gm-btn-get-directions:hover { - text-decoration: underline; - color: #427fed; -} - -.gm-btn-get-directions:focus { - outline: none; - color: #427fed; -} diff --git a/themes/hotel-reservation-theme/header.tpl b/themes/hotel-reservation-theme/header.tpl index 4de30a7cc..721a71cef 100644 --- a/themes/hotel-reservation-theme/header.tpl +++ b/themes/hotel-reservation-theme/header.tpl @@ -1,154 +1,4 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - - - - - - - - - {$meta_title|escape:'html':'UTF-8'} - {if isset($meta_description) AND $meta_description} - - {/if} - {if isset($meta_keywords) AND $meta_keywords} - - {/if} - - - - - - - {if isset($css_files)} - {foreach from=$css_files key=css_uri item=media} - {if $css_uri == 'lteIE9'} - - {else} - - {/if} - {/foreach} - {/if} - {if isset($js_defer) && !$js_defer && isset($js_files) && isset($js_def)} - {$js_def} - {foreach from=$js_files item=js_uri} - - {/foreach} - {/if} - {block name='displayHeader'} - {$HOOK_HEADER} - {/block} - - - - - - - - - - - {if !isset($content_only) || !$content_only} - {if isset($restricted_country_mode) && $restricted_country_mode} -
-

{l s='You cannot place a new order from your country.'}{if isset($geolocation_country) && $geolocation_country} {$geolocation_country|escape:'html':'UTF-8'}{/if}

-
- {/if} -
-
- -
-
-
- {if $show_breadcrump} - {block name='breadcrumb'} - {include file="$tpl_dir./breadcrumb.tpl"} - {/block} - {/if} -
-
{hook h="displayTopColumn"}
-
-
- {if isset($left_column_size) && !empty($left_column_size)} -
{$HOOK_LEFT_COLUMN}
- {/if} - {if isset($left_column_size) && isset($right_column_size)}{assign var='cols' value=(12 - $left_column_size - $right_column_size)}{else}{assign var='cols' value=12}{/if} -
- {/if} +/home/users/vishal.singh/www/html/Review/QloApps-gli-2489/tools/smarty/sysplugins/smarty_internal_compile_foreach.php + 33,56: public $optional_attributes = array('name', 'key', 'properties'); + 142,27: if (isset($_attr[ 'properties' ]) && preg_match_all('/[\'](.*?)[\']/', $_attr[ 'properties' ], $match)) { + 142,88: if (isset($_attr[ 'properties' ]) && preg_match_all('/[\'](.*?)[\']/', $_attr[ 'properties' ], $match)) { \ No newline at end of file diff --git a/themes/hotel-reservation-theme/js/properties.js b/themes/hotel-reservation-theme/js/our-properties.js similarity index 93% rename from themes/hotel-reservation-theme/js/properties.js rename to themes/hotel-reservation-theme/js/our-properties.js index c48b6944d..ba9408875 100644 --- a/themes/hotel-reservation-theme/js/properties.js +++ b/themes/hotel-reservation-theme/js/our-properties.js @@ -21,7 +21,6 @@ */ $(document).ready(function() { - //By Webkul JS for Map locations of the hotels on google Map if (typeof hotelLocationArray != 'undefined' && $('#map').length @@ -30,6 +29,12 @@ $(document).ready(function() { ) { initMap(); } + + $(document).on('click', 'ul.pagination li a', function(e){ + e.preventDefault(); + $('#pagination').val($(this).data('pagination')); + $('form#our-properties-list').submit(); + }); }); function initMap() { diff --git a/themes/hotel-reservation-theme/modules/blockuserinfo/nav.tpl b/themes/hotel-reservation-theme/modules/blockuserinfo/nav.tpl index 0c17e55b6..b68943311 100644 --- a/themes/hotel-reservation-theme/modules/blockuserinfo/nav.tpl +++ b/themes/hotel-reservation-theme/modules/blockuserinfo/nav.tpl @@ -47,10 +47,5 @@ {/if} {if !isset($ajaxCustomerLogin)}
- {if isset($WK_DISPLAY_OUR_HOTEL_TAB_IN_HEADER) && $WK_DISPLAY_OUR_HOTEL_TAB_IN_HEADER} - - {/if} {/if} {/block} diff --git a/themes/hotel-reservation-theme/properties.tpl b/themes/hotel-reservation-theme/our-properties.tpl similarity index 86% rename from themes/hotel-reservation-theme/properties.tpl rename to themes/hotel-reservation-theme/our-properties.tpl index 12ade303e..094f83dff 100644 --- a/themes/hotel-reservation-theme/properties.tpl +++ b/themes/hotel-reservation-theme/our-properties.tpl @@ -25,8 +25,8 @@ {if isset($hotelsInfo) && $hotelsInfo} {block name='our_properties_list_title'}
-

{l s='Our Hotels'}

-
+

{l s='Our Properties'}

+

{$WK_HTL_SHORT_DESC|escape:'html':'UTF-8'}

@@ -38,7 +38,7 @@ {block name='our_properties_location'} {if isset($hotelLocationArray) && $hotelLocationArray && isset($displayHotelMap) && $displayHotelMap} -
+
@@ -55,11 +55,11 @@ {hook h='displayPropertiesListBefore'} {/block} -
+
{block name='our_properties_list'}
{foreach $hotelsInfo as $hotel} -
+
@@ -74,9 +74,9 @@ {$hotel['email']}

- {l s='View Rooms'} + {l s='View Rooms'} {if ($hotel['latitude'] != 0 || $hotel['longitude'] != 0) && $viewOnMap} - {l s='View on map'} + {l s='View on map'} {/if}
@@ -91,7 +91,7 @@ {/block} {if (isset($pageLimit)) && $pageLimit > 1} -
+