diff --git a/public/typo3conf/ext/ep_products/Classes/Domain/Repository/ContingentRepository.php b/public/typo3conf/ext/ep_products/Classes/Domain/Repository/ContingentRepository.php index 0750d937..527df86c 100644 --- a/public/typo3conf/ext/ep_products/Classes/Domain/Repository/ContingentRepository.php +++ b/public/typo3conf/ext/ep_products/Classes/Domain/Repository/ContingentRepository.php @@ -148,7 +148,7 @@ class ContingentRepository extends AbstractRepository implements ProviderInterfa 'c.additional_night_min_price as additionalNightPrice', 'c.additional_night_min_nights as additionalNightMinNights', 'd.bus_pro_id as busProId', 'd.services_included as servicesIncluded', 'd.services_general as servicesOptional', - 'd.skipass_included as skipassIncluded', 'd.season as season') + 'd.skipass_included as skiPassIncluded', 'd.season as season') ->from('tx_epproducts_domain_model_contingent', 'c') ->innerJoin('c', 'tx_epproducts_domain_model_date', 'd', 'c.date = d.date_start AND c.hotel_code = d.hotel_code') ->where('c.hotel = :hotelUid') diff --git a/public/typo3conf/ext/ep_products/Classes/Domain/Repository/ProductRepository.php b/public/typo3conf/ext/ep_products/Classes/Domain/Repository/ProductRepository.php index 63fa7940..f2604017 100644 --- a/public/typo3conf/ext/ep_products/Classes/Domain/Repository/ProductRepository.php +++ b/public/typo3conf/ext/ep_products/Classes/Domain/Repository/ProductRepository.php @@ -26,8 +26,8 @@ class ProductRepository extends AbstractRepository 'date.earlybird as earlybird', 'date.new as new', 'date.low_contingent as lowContingent', 'date.board as board', 'date.product_fact as productFact', 'date.hotel_fact as hotelFact', 'date.region_fact as regionFact', 'date.services_included as servicesIncluded', - 'date.min_price as minPrice', 'date.nights as nights', 'date.available as available', - 'date.pseudo_price as pseudoPrice' + 'date.skipass_included as skiPassIncluded', 'date.min_price as minPrice', 'date.nights as nights', + 'date.available as available', 'date.pseudo_price as pseudoPrice' ) ->from('tx_epproducts_domain_model_date', 'date') ->where($qb->expr()->in( @@ -71,7 +71,7 @@ class ProductRepository extends AbstractRepository 'date.earlybird as earlybird', 'date.new as new', 'date.low_contingent as lowContingent', 'date.board as board', 'date.board_bus_pro_id as boardUid', 'date.product_fact as productFact', 'date.hotel_fact as hotelFact', 'date.region_fact as regionFact', - 'date.services_included as servicesIncluded', + 'date.services_included as servicesIncluded', 'date.skipass_included as skiPassIncluded', 'date.bus_available as busAvailable', 'date.new as new', 'date.min_price as minPrice', 'date.nights as nights', 'date.available as available', 'date.pseudo_price as pseudoPrice', 'date.hide_booking_button as hideBookingButton', @@ -134,7 +134,7 @@ class ProductRepository extends AbstractRepository 'country_name as countryName', 'country_code as countryCode', 'date_start as dateStart', 'date_end as dateEnd', 'uid as dateUid', 'min_price as minPrice', 'pseudo_price as pseudoPrice', 'nights as nights', 'available as available', 'season as season', - 'skipass_included as skipassIncluded', 'bus_included as busIncluded', + 'skipass_included as skiPassIncluded', 'bus_included as busIncluded', 'earlybird', 'new', 'daytrip', 'hide_booking_button as hideBookingButton', 'low_contingent as lowContingent', 'concept as conceptUid', 'concept_code as conceptCode', 'concept_name as conceptName', 'concept_popup_text as conceptPopupText', 'board', 'new' @@ -200,7 +200,7 @@ class ProductRepository extends AbstractRepository ->select( 'date.uid as dateUid', 'date.date_start as dateStart', 'date.date_end as dateEnd', 'date.bus_pro_id as dateBusProId', 'date.hotel as hotelUid', 'date.hotel_bus_pro_id as hotelBusProId', - 'date.bus_included as dateBusIncluded', 'date.skipass_included as dateSkipassIncluded', + 'date.bus_included as dateBusIncluded', 'date.skipass_included as dateSkiPassIncluded', 'date.season as season', 'date.product_detail_page as productDetailPage', 'room.uid as roomUid', 'room.bus_pro_id as roomBusProId', 'room.name as roomName', 'room.price as roomPrice', 'date.discount as roomDiscount', 'date.bus_price as busPrice', @@ -263,7 +263,7 @@ class ProductRepository extends AbstractRepository 'date.season as season', 'date.min_price as dateMinPrice', 'date.pseudo_price as datePseudoPrice', 'date.discount as dateDiscount', 'date.bus_price as busPrice', 'date.nights as dateNights', 'date.bus_included as dateBusIncluded', 'date.services_included as dateServicesIncluded', - 'date.services_general as dateServicesGeneral', 'date.skipass_included as dateSkipassIncluded', + 'date.services_general as dateServicesGeneral', 'date.skipass_included as dateSkiPassIncluded', 'date.bus_pro_id as dateBusProId', 'date.hotel_bus_pro_id as hotelBusProId', 'date.available as available', 'date.product_detail_page as productDetailPage', ) @@ -332,7 +332,7 @@ class ProductRepository extends AbstractRepository 'date.min_price as dateMinPrice', 'date.discount as dateDiscount', 'date.bus_price as busPrice', 'date.nights as dateNights', 'date.bus_included as dateBusIncluded', 'date.bus_price as busPrice', 'date.services_included as dateServicesIncluded', 'date.services_general as dateServicesGeneral', - 'date.skipass_included as dateSkipassIncluded', 'date.bus_pro_id as dateBusProId', + 'date.skipass_included as dateSkiPassIncluded', 'date.bus_pro_id as dateBusProId', 'date.discount as roomDiscount', 'date.hotel_bus_pro_id as hotelBusProId', 'date.pickups as pickups', 'room.uid as roomUid', 'room.bus_pro_id as roomBusProId', 'room.code as roomCode', 'room.name as roomName', 'room.price as roomPrice', 'room.pax as roomPax', diff --git a/public/typo3conf/ext/ep_products/Classes/Domain/Serialization/Date.php b/public/typo3conf/ext/ep_products/Classes/Domain/Serialization/Date.php index e29fb96c..d4f62f37 100644 --- a/public/typo3conf/ext/ep_products/Classes/Domain/Serialization/Date.php +++ b/public/typo3conf/ext/ep_products/Classes/Domain/Serialization/Date.php @@ -46,7 +46,7 @@ class Date $date['to'] = $array['dateEnd']; $date['minprice'] = $array['dateMinPrice']; $date['nights'] = $array['dateNights']; - $date['skipassincluded'] = $array['dateSkipassIncluded']; + $date['skipassincluded'] = $array['dateSkiPassIncluded']; $date['busincluded'] = $array['dateBusIncluded']; $date['servicesincluded']['service'] = unserialize($array['dateServicesIncluded']); $servicesGeneral = unserialize($array['dateServicesGeneral']); diff --git a/public/typo3conf/ext/ep_products/Classes/Service/DateService.php b/public/typo3conf/ext/ep_products/Classes/Service/DateService.php index c3642e02..7cc74854 100644 --- a/public/typo3conf/ext/ep_products/Classes/Service/DateService.php +++ b/public/typo3conf/ext/ep_products/Classes/Service/DateService.php @@ -229,7 +229,7 @@ class DateService implements SingletonInterface 'season' => $row['season'], 'summer' => $row['season'] === 's', 'busIncluded' => (bool) $row['dateBusIncluded'], - 'skipassIncluded' => (bool) $row['dateSkipassIncluded'], + 'skiPassIncluded' => (bool) $row['dateSkiPassIncluded'], 'roomUid' => $row['roomUid'], 'roomName' => $row['roomName'], 'available' => $row['roomAvailable'] && $row['roomPrice'], @@ -319,7 +319,7 @@ class DateService implements SingletonInterface 'discount' => $row['dateDiscount'] ?? 0, 'nights' => $row['dateNights'], 'busIncluded' => (bool) $row['dateBusIncluded'], - 'skipassIncluded' => (bool) $row['dateSkipassIncluded'], + 'skiPassIncluded' => (bool) $row['dateSkiPassIncluded'], 'servicesIncluded' => unserialize($row['dateServicesIncluded'], ['allowed_classes' => false]), 'servicesGeneral' => unserialize($row['dateServicesGeneral'], ['allowed_classes' => false]), 'season' => $row['season'], @@ -434,7 +434,7 @@ class DateService implements SingletonInterface public function hasIncludedServices(array $tableData): bool { foreach ($tableData as $row) { - if ($row['busIncluded'] || $row['skipassIncluded']) { + if ($row['busIncluded'] || $row['skiPassIncluded']) { return true; } } diff --git a/public/typo3conf/ext/ep_products/Classes/Service/ProductDataService.php b/public/typo3conf/ext/ep_products/Classes/Service/ProductDataService.php index db775ef5..f1d65b23 100644 --- a/public/typo3conf/ext/ep_products/Classes/Service/ProductDataService.php +++ b/public/typo3conf/ext/ep_products/Classes/Service/ProductDataService.php @@ -131,8 +131,8 @@ class ProductDataService implements SingletonInterface $teaser['dates'][] = $row['dateStart']; } - if (!$teaser['skipassIncluded'] && $row['skipassIncluded']) { - $teaser['skipassIncluded'] = true; + if (!$teaser['skiPassIncluded'] && $row['skiPassIncluded']) { + $teaser['skiPassIncluded'] = true; } if (!$teaser['busIncluded'] && $row['busIncluded']) { diff --git a/public/typo3conf/ext/ep_products/Classes/Service/SearchResultService.php b/public/typo3conf/ext/ep_products/Classes/Service/SearchResultService.php index 7aeddda3..56a7cd0a 100644 --- a/public/typo3conf/ext/ep_products/Classes/Service/SearchResultService.php +++ b/public/typo3conf/ext/ep_products/Classes/Service/SearchResultService.php @@ -158,6 +158,7 @@ class SearchResultService implements SingletonInterface 'nights' => [], 'rooms' => [], 'new' => $row['new'], + 'skiPassIncluded' => $row['skiPassIncluded'], ]; $total++; } diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Pricetable.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Pricetable.html index 2c1dfe72..31e5d278 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Pricetable.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Pricetable.html @@ -72,7 +72,7 @@ {ep:icon(icon: 'bus', class: 'w-4 h-4 md:w-5 md:h-5')} - + diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/HeaderDetail.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/HeaderDetail.html index 6f866809..fcb7913b 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/HeaderDetail.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/HeaderDetail.html @@ -65,7 +65,7 @@ - +
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Teaser.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Teaser.html index 7c721c97..27f35de0 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Teaser.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Teaser.html @@ -96,14 +96,14 @@ ab {minPrice} €
- p. P.{f:if(condition: '{season} == "w"', then: ' / inkl. Skipass')} + p. P.{f:if(condition: '{season} == "w" && {skiPassIncluded}', then: ' / inkl. Skipass')}
- +
  • {ep:icon(class: 'w-6 h-6 text-ep-primary-light', icon: 'check')} Skipass diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Region/Details.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Region/Details.html index 82f8fb57..3c7e6d97 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Region/Details.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Region/Details.html @@ -91,7 +91,8 @@ forceHotelUid: teaser.forceHotelUid, dateFrom: teaser.minDateStart, dateTo: teaser.maxDateEnd, - index: iteration.index + index: iteration.index, + skiPassIncluded: teaser.skiPassIncluded }"/> diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Search/Result.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Search/Result.html index aede3bd4..919b17e2 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Search/Result.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Search/Result.html @@ -83,6 +83,7 @@ forceHotelUid: 1, showHotelDetails: 1, new: item.new, + skiPassIncluded: item.skiPassIncluded, referringPageUri: referringPageUri }"/> diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Datestable.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Datestable.html index 7cf7d176..11075b31 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Datestable.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Datestable.html @@ -100,7 +100,7 @@ - + - + diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Pricetable.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Pricetable.html index ad24fba4..d52d3e80 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Pricetable.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Pricetable.html @@ -219,7 +219,7 @@ - + diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Country/Detail.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Country/Detail.html index 1bce678f..d95e2fe8 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Country/Detail.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Country/Detail.html @@ -72,7 +72,8 @@ dateFrom: dateFrom, dateTo: dateTo, index: iteration.index, - globalConceptCode: settings.globalConceptCode + globalConceptCode: settings.globalConceptCode, + skiPassIncluded: teaser.skiPassIncluded }"/> diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/TeaserProduct.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/TeaserProduct.html index e775573f..f5e435ad 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/TeaserProduct.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/TeaserProduct.html @@ -24,6 +24,7 @@ dateFrom: dateFrom, dateTo: dateTo, new: teaser.new, + skiPassIncluded: teaser.skiPassIncluded, landscape: '{f:if(condition: \'{data.layout} == 2 || {data.layout} == 3\', then: 1, else: 0)}' }"/> diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Teasergroup.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Teasergroup.html index cad2f37f..0520911d 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Teasergroup.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Teasergroup.html @@ -53,7 +53,8 @@ dateTo: dateTo, new: teaser.new, index: iteration.index, - globalConceptCode: settings.globalConceptCode + globalConceptCode: settings.globalConceptCode, + skiPassIncluded: teaser.skiPassIncluded }"/> diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Reseller/Copypaste.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Reseller/Copypaste.html index 0d0a02bc..fba528ee 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Reseller/Copypaste.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Reseller/Copypaste.html @@ -131,11 +131,11 @@ Bus inkl. - {f:if(condition: date.busincluded, then: 'ja', else: 'nein')} + {f:if(condition: date.busIncluded, then: 'ja', else: 'nein')} Skipass inkl. - {f:if(condition: date.skipassincluded, then: 'ja', else: 'nein')} + {f:if(condition: date.skiPassIncluded, then: 'ja', else: 'nein')} Zimmer