diff --git a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl index 5d74f7313..dc4f57c56 100644 --- a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl @@ -311,8 +311,8 @@
- - {l s='Sample Hotels file'} + + {l s='Sample Properties file'} {l s='Sample Room Types file'} diff --git a/admin-dev/themes/default/template/controllers/products/configuration.tpl b/admin-dev/themes/default/template/controllers/products/configuration.tpl index 02d04e3b6..db851fc77 100644 --- a/admin-dev/themes/default/template/controllers/products/configuration.tpl +++ b/admin-dev/themes/default/template/controllers/products/configuration.tpl @@ -179,6 +179,14 @@ + + + + + 0 + + + {hook h='displayHotelRoomListTableRowColumn' index=$k} {if $k == 1} diff --git a/docs/csv_import/hotels_import.csv b/docs/csv_import/properties_import.csv similarity index 73% rename from docs/csv_import/hotels_import.csv rename to docs/csv_import/properties_import.csv index 537e704cc..27783a34d 100644 --- a/docs/csv_import/hotels_import.csv +++ b/docs/csv_import/properties_import.csv @@ -1,3 +1,3 @@ -Hotel ID;Active(0/1);Hotel Name;Short Description;Description;Mobile Phone;Email;Address;Rating;Check-In;Check-Out;Country ID;State ID;City;Zip Code;Fax;Hotel Policies;Allow Refund(0/1);Refund IDs (x,y,z...);Maximum checkout offset;Min booking offset;Image URLs (x,y,z...);Delete Existing Images (0 = No, 1 = Yes) +Property ID;Active(0/1);Property Name;Short Description;Description;Mobile Phone;Email;Address;Rating;Check-In;Check-Out;Country ID;State ID;City;Zip Code;Fax;Property Policies;Allow Refund(0/1);Refund IDs (x,y,z...);Maximum checkout offset;Min booking offset;Image URLs (x,y,z...);Delete Existing Images (0 = No, 1 = Yes) 2;1;The Kings Hotel;The Kings Hotel with king size rooms. visit for a wonderful experience.;The Kings Hotel with king-size rooms. visit for a wonderful experience.;0900000009;kingshotel@demo.com;Greene St, New York, NY 10003, USA;3;12:00;11:00;21;32;New York;10003;;1. intelligentsia tattooed pop-up salvia asymmetrical mixtape meggings tousled ramps VHS cred.2. intelligentsia tattooed pop-up salvia asymmetrical mixtape meggings tousled ramps VHS cred.;1;1;4;0;http://localhost/hotelcommerce/modules/hotelreservationsystem/views/img/hotel_img/1/1.jpg;0 -3;1;The Sunshine Palace Inn;The Sunshine Palace Inn is a beautiful hotel in japan.;The Sunshine Palace Inn is a beautiful hotel in japan.;0900000009;sunshine@demo.com;Shingashi, Itabashi, Tokyo;4;09:00;08:00;11;306;Tokyo;611-0043;;1.loremipsertmkjbg ag mixtape meggings tousled ramps VHS cred.;0;0;;3;http://localhost/hotelcommerce/modules/hotelreservationsystem/views/img/hotel_img/1/2.jpg,http://localhost/hotelcommerce/modules/hotelreservationsystem/views/img/hotel_img/1/3.jpg;0 +3;1;The Sunshine Palace Inn;The Sunshine Palace Inn is a beautiful hotel in japan.;The Sunshine Palace Inn is a beautiful hotel in japan.;0900000009;sunshine@demo.com;Shingashi, Itabashi, Tokyo;4;09:00;08:00;11;306;Tokyo;611-0043;;1.loremipsertmkjbg ag mixtape meggings tousled ramps VHS cred.;0;0;;3;http://localhost/hotelcommerce/modules/hotelreservationsystem/views/img/hotel_img/1/2.jpg,http://localhost/hotelcommerce/modules/hotelreservationsystem/views/img/hotel_img/1/3.jpg;0 \ No newline at end of file diff --git a/install-dev/data/xml/meta.xml b/install-dev/data/xml/meta.xml index 04b321f20..32e6ff9a1 100644 --- a/install-dev/data/xml/meta.xml +++ b/install-dev/data/xml/meta.xml @@ -38,10 +38,10 @@ 1 --> - + supplier 1 diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php index 4b850622b..055833d3c 100644 --- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php +++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php @@ -1834,7 +1834,7 @@ class HotelBookingDetail extends ObjectModel if (!empty($bookingData)) { $maxAmenities = (int) Configuration::get('WK_MAX_AMENITIES_ROOM_SEARCH'); $maxFeatures = (int) Configuration::get('WK_MAX_FEATURES_ROOM_SEARCH'); - $maxFeatureValues = (int) Configuration::get('WK_MAX_FEATURE_VALUES_ROOM_SEARCH'); + $maxFeatureValues = (int) Configuration::get('WK_MAX_ROOM_TYPE_FEATURE_VALUES'); foreach ($bookingData['rm_data'] as $key => $value) { // featured amenities for display in room type list $featured_amenities = HotelRoomTypeAmenities::getAmenities( diff --git a/modules/hotelreservationsystem/hotelreservationsystem.php b/modules/hotelreservationsystem/hotelreservationsystem.php index 0af5901fa..35174bcf1 100644 --- a/modules/hotelreservationsystem/hotelreservationsystem.php +++ b/modules/hotelreservationsystem/hotelreservationsystem.php @@ -446,7 +446,8 @@ class HotelReservationSystem extends Module 'htl_branch_info', 'htl_amenity', 'htl_order_refund_rules', - 'htl_settings_link' + 'htl_settings_link', + 'htl_header_image' ); //If Admin update new language when we do entry in module all lang tables. HotelHelper::updateLangTables($newIdLang, $langTables); diff --git a/modules/hotelreservationsystem/views/css/qhrs_header_media.css b/modules/hotelreservationsystem/views/css/qhrs_header_media.css index 9669e2622..6a267c2a0 100644 --- a/modules/hotelreservationsystem/views/css/qhrs_header_media.css +++ b/modules/hotelreservationsystem/views/css/qhrs_header_media.css @@ -104,7 +104,6 @@ display: none; } -/* Owl carousel slide animation classes */ .wkFadeOut { animation: wkFadeOut 0.7s forwards; } .wkFadeIn { animation: wkFadeIn 0.7s forwards; } .wkZoomOut { animation: wkZoomOut 0.7s forwards; } @@ -115,11 +114,11 @@ .wkSlideIn { animation: wkSlideIn 0.7s forwards; } @keyframes wkFadeOut { from { opacity:1; } to { opacity:0; } } -@keyframes wkFadeIn { from { opacity:0; } to { opacity:1; } } +@keyframes wkFadeIn { from { opacity:1; } to { opacity:1; } } @keyframes wkZoomOut { from { opacity:1; transform:scale(1); } to { opacity:0; transform:scale(1.15); } } -@keyframes wkZoomIn { from { opacity:0; transform:scale(0.88); } to { opacity:1; transform:scale(1); } } +@keyframes wkZoomIn { from { opacity:1; transform:scale(0.88); } to { opacity:1; transform:scale(1); } } @keyframes wkBlurOut { from { opacity:1; filter:blur(0); } to { opacity:0; filter:blur(10px); } } -@keyframes wkBlurIn { from { opacity:0; filter:blur(10px); } to { opacity:1; filter:blur(0); } } +@keyframes wkBlurIn { from { opacity:1; filter:blur(10px); } to { opacity:1; filter:blur(0); } } @keyframes wkSlideOut { from { transform:translateX(0); } to { transform:translateX(-100%); } } @keyframes wkSlideIn { from { transform:translateX(100%); } to { transform:translateX(0); } } @@ -144,6 +143,7 @@ height: 100%; z-index: -11; overflow: hidden; + background-color: #252525; background-size: cover; background-position: center center; background-repeat: no-repeat; @@ -160,6 +160,10 @@ pointer-events: none; } +#index #page { + overflow-x: clip; +} + .header-media-layer .owl-carousel, .header-media-layer .owl-stage-outer, .header-media-layer .owl-stage, @@ -168,7 +172,7 @@ } .header-slide-img { - width: 100%; + width: calc(100% + 1px); height: 100%; background-size: cover; background-position: center center; @@ -228,4 +232,4 @@ margin: 0; text-align: center; line-height: 23px; -} +} \ No newline at end of file diff --git a/modules/hotelreservationsystem/views/js/qhrs_hotel_header_media_front.js b/modules/hotelreservationsystem/views/js/qhrs_hotel_header_media_front.js index e1fcb647a..d4e120bfa 100644 --- a/modules/hotelreservationsystem/views/js/qhrs_hotel_header_media_front.js +++ b/modules/hotelreservationsystem/views/js/qhrs_hotel_header_media_front.js @@ -47,6 +47,7 @@ $(document).ready(function () { var animLabel = animNames[animType] || 'Slide'; var showDots = (navType === 1 || navType === 3); + var isSlide = (animType === 1); $imgCarousel.owlCarousel({ loop: true, items: 1, @@ -56,9 +57,12 @@ $(document).ready(function () { autoplay: autoPlay, autoplayTimeout: interval, autoplaySpeed: 800, + smartSpeed: 800, autoplayHoverPause: false, - animateOut: 'wk' + animLabel + 'Out', - animateIn: 'wk' + animLabel + 'In', + mouseDrag: isSlide, + touchDrag: isSlide, + animateOut: isSlide ? false : 'wk' + animLabel + 'Out', + animateIn: isSlide ? false : 'wk' + animLabel + 'In', responsiveClass: true, rtl: (typeof language_is_rtl !== 'undefined' ? language_is_rtl : false) }); diff --git a/themes/hotel-reservation-theme/css/category.css b/themes/hotel-reservation-theme/css/category.css index d0ea2e9e3..712fa14ba 100644 --- a/themes/hotel-reservation-theme/css/category.css +++ b/themes/hotel-reservation-theme/css/category.css @@ -77,6 +77,16 @@ margin-bottom: 10px; } +#category_data_cont a:focus > .rm_heading +{ + outline: none; +} + +#category_data_cont a:focus:has(> .rm_heading) +{ + outline: none; +} + .rm_desc { line-height: 22px;