EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove filtersettings from url arguments completely

Browse Source
This commit is contained in:
Björn Fromme
2018-10-07 15:28:46 +02:00
parent 8cc504097d
commit 74d46bd43b
16 changed files with 420 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/typo3conf/ext/ep_products/Classes/Controller/ProductController.php
+3 -18
View File
@@ -35,15 +35,12 @@ use EP\EpProducts\Service\DateService;
use EP\EpProducts\Service\FilterService; use EP\EpProducts\Service\FilterService;
use EP\EpProducts\Service\HotelDataService; use EP\EpProducts\Service\HotelDataService;
use EP\EpProducts\Service\ProductDataService; use EP\EpProducts\Service\ProductDataService;
use EP\EpProducts\Traits\RequestArgumentTypeConversionTrait;
use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Mvc\Controller\ActionController; use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
class ProductController extends ActionController class ProductController extends ActionController
{ {
use RequestArgumentTypeConversionTrait;
/** /**
* @var \EP\EpProducts\Domain\Repository\ProductRepository * @var \EP\EpProducts\Domain\Repository\ProductRepository
*/ */
@@ -100,22 +97,15 @@ class ProductController extends ActionController
$this->filterService = $filterService; $this->filterService = $filterService;
} }
public function initializeAction()
{
$this->processFilterSettingsArgument();
}
/** /**
* @param Product $product * @param Product $product
* @param Hotel $hotel * @param Hotel $hotel
* @param int $referringPageUid
* @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
* @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
*/ */
public function detailAction( public function detailAction(
Product $product = null, Product $product = null,
Hotel $hotel = null, Hotel $hotel = null
$referringPageUid = null
) )
{ {
// Get product to display from flexform settings if not provided via url // Get product to display from flexform settings if not provided via url
@@ -137,7 +127,6 @@ class ProductController extends ActionController
if ($product->getHotels()->count() > 1) { if ($product->getHotels()->count() > 1) {
$arguments = [ $arguments = [
'product' => $product, 'product' => $product,
'referringPageUid' => $referringPageUid,
]; ];
$this->forward('hotelList', null, null, $arguments); $this->forward('hotelList', null, null, $arguments);
} }
@@ -153,8 +142,6 @@ class ProductController extends ActionController
$this->view->assignMultiple([ $this->view->assignMultiple([
'hotel' => $hotel, 'hotel' => $hotel,
'product' => $product, 'product' => $product,
'referringPageUid' => $referringPageUid,
'currentPageUid' => $GLOBALS['TSFE']->id,
'isProductWithExcludedConcept' => $isProductWithExcludedConcept, 'isProductWithExcludedConcept' => $isProductWithExcludedConcept,
'isProductWithNoInfoConcept' => $isProductWithNoInfoConcept, 'isProductWithNoInfoConcept' => $isProductWithNoInfoConcept,
]); ]);
@@ -178,18 +165,16 @@ class ProductController extends ActionController
/** /**
* @param Product $product * @param Product $product
* @param int $referringPageUid
*/ */
public function hotelListAction( public function hotelListAction(
Product $product, Product $product
$referringPageUid = null
) )
{ {
$hotels = $this->hotelDataService->getList($product); $hotels = $this->hotelDataService->getList($product);
$this->view->assignMultiple([ $this->view->assignMultiple([
'hotels' => $hotels, 'hotels' => $hotels,
'product' => $product, 'product' => $product,
'referringPageUid' => $referringPageUid, 'currentPageUid' => $GLOBALS['TSFE']->id,
'linkHotel' => true, 'linkHotel' => true,
]); ]);
} }
web/typo3conf/ext/ep_products/Classes/Domain/Repository/DateRepository.php
+13 -13
View File
@@ -129,13 +129,13 @@ class DateRepository extends AbstractRepository
$qb = $this->getDbConnection()->createQueryBuilder(); $qb = $this->getDbConnection()->createQueryBuilder();
$query = $qb $query = $qb
->select('hotel uid') ->select('hotel as uid')
->addSelectLiteral('REPLACE(hotel_name, "\r\n", " ") name') ->addSelectLiteral('REPLACE(hotel_name, "\r\n", " ") name')
->from('tx_epproducts_domain_model_date', 'date') ->from('tx_epproducts_domain_model_date', 'date')
->where('product_searchable = 1') ->where('product_searchable = 1')
->andWhere($qb->expr()->orX( ->andWhere($qb->expr()->orX(
$qb->expr()->like('LOWER(hotel_name) COLLATE utf8_bin',':searchName'), $qb->expr()->like('hotel_name',':searchName'),
$qb->expr()->like('LOWER(hotel_keywords) COLLATE utf8_bin', ':searchKeywords') $qb->expr()->like('hotel_keywords', ':searchKeywords')
)) ))
->orderBy('hotel_name') ->orderBy('hotel_name')
->groupBy('hotel_name') ->groupBy('hotel_name')
@@ -170,14 +170,14 @@ class DateRepository extends AbstractRepository
->from('tx_epproducts_domain_model_date', 'date') ->from('tx_epproducts_domain_model_date', 'date')
->where('product_searchable = 1') ->where('product_searchable = 1')
->andWhere($qb->expr()->orX( ->andWhere($qb->expr()->orX(
$qb->expr()->like('LOWER(product_name) COLLATE utf8_bin',':searchName'), $qb->expr()->like('product_name',':searchName'),
$qb->expr()->like('LOWER(product_keywords) COLLATE utf8_bin', ':searchKeywords'), $qb->expr()->like('product_keywords', ':searchKeywords'),
$qb->expr()->like('LOWER(country_name) COLLATE utf8_bin',':searchKeywords'), $qb->expr()->like('country_name',':searchKeywords'),
$qb->expr()->like('LOWER(country_keywords) COLLATE utf8_bin', ':searchKeywords'), $qb->expr()->like('country_keywords', ':searchKeywords'),
$qb->expr()->like('LOWER(region_name) COLLATE utf8_bin', ':searchKeywords'), $qb->expr()->like('region_name', ':searchKeywords'),
$qb->expr()->like('LOWER(region_keywords) COLLATE utf8_bin', ':searchKeywords'), $qb->expr()->like('region_keywords', ':searchKeywords'),
$qb->expr()->like('LOWER(city_name) COLLATE utf8_bin', ':searchKeywords'), $qb->expr()->like('city_name', ':searchKeywords'),
$qb->expr()->like('LOWER(city_keywords) COLLATE utf8_bin', ':searchKeywords') $qb->expr()->like('city_keywords', ':searchKeywords')
)) ))
->orderBy('product_name') ->orderBy('product_name')
->groupBy('product_name') ->groupBy('product_name')
@@ -218,8 +218,8 @@ class DateRepository extends AbstractRepository
->from('tx_epproducts_domain_model_date', 'date') ->from('tx_epproducts_domain_model_date', 'date')
->where('product_searchable = 1') ->where('product_searchable = 1')
->andWhere($qb->expr()->orX( ->andWhere($qb->expr()->orX(
$qb->expr()->like('LOWER(' . $type . '_name) COLLATE utf8_bin',':searchName'), $qb->expr()->like($type . '_name',':searchName'),
$qb->expr()->like('LOWER(' . $type . '_keywords) COLLATE utf8_bin', ':searchKeywords') $qb->expr()->like($type . '_keywords', ':searchKeywords')
)) ))
->orderBy($type . '_name') ->orderBy($type . '_name')
->groupBy($type . '_name') ->groupBy($type . '_name')
web/typo3conf/ext/ep_products/Classes/Traits/RequestArgumentTypeConversionTrait.php
+3 -3
View File
@@ -136,13 +136,13 @@ trait RequestArgumentTypeConversionTrait
*/ */
static protected function convertType($value) static protected function convertType($value)
{ {
if (is_string($value) && (strtolower($value) === 'true' || strtolower($value) === 'false')) { if (\is_string($value) && (strtolower($value) === 'true' || strtolower($value) === 'false')) {
return strtolower($value) === 'true'; return strtolower($value) === 'true';
} }
if (is_numeric($value)) { if (\is_numeric($value)) {
return (int) $value; return (int) $value;
} }
if (is_array($value)) { if (\is_array($value)) {
return array_map(function($item) { return array_map(function($item) {
return static::convertType($item); return static::convertType($item);
}, $value); }, $value);
web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_app.js
+5 -1
View File
@@ -30,6 +30,8 @@ import EventPricetable from './components/EventPriceTable.vue'
import ContactForm from './components/ContactForm.vue' import ContactForm from './components/ContactForm.vue'
import WatchlistToggle from './components/WatchlistToggle.vue' import WatchlistToggle from './components/WatchlistToggle.vue'
import Watchlist from './components/Watchlist.vue' import Watchlist from './components/Watchlist.vue'
import HotelList from './components/HotelList.vue'
import ReferrerLink from './components/ReferrerLink.vue'
// Define global constants // Define global constants
const $window = $(window); const $window = $(window);
@@ -59,7 +61,9 @@ new Vue({
EventPricetable, EventPricetable,
ContactForm, ContactForm,
WatchlistToggle, WatchlistToggle,
Watchlist Watchlist,
HotelList,
ReferrerLink
}, },
data () { data () {
return { return {
web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_filtersettings.js
+1
View File
@@ -10,6 +10,7 @@ export default {
conceptUids: [], conceptUids: [],
dateFrom: null, dateFrom: null,
dateTo: null, dateTo: null,
priceRange: 0,
nights: 0, nights: 0,
pax: 1, pax: 1,
hotelTypes: [], hotelTypes: [],
web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/HotelList.vue
+35
View File
@@ -0,0 +1,35 @@
<script>
import WatchlistToggle from './WatchlistToggle.vue'
import ReferrerLink from './ReferrerLink.vue'
import defaultFilterSettings from '../_filtersettings'
export default {
components: {
WatchlistToggle,
ReferrerLink
},
props: {
referringPageUrl: {
type: String,
required: true
},
watchlist: {
type: Array,
default () {
return [];
}
}
},
data () {
return {
filterSettings: defaultFilterSettings
}
},
created () {
if (this.$session.has('filterSettings')) {
this.filterSettings = this.$session.get('filterSettings')
}
}
}
</script>
web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/PriceRangeSelect.vue
+4 -3
View File
@@ -31,6 +31,7 @@
required: true required: true
}, },
range: { range: {
type: Number,
default: 0 default: 0
}, },
showLabel: { showLabel: {
@@ -40,7 +41,7 @@
}, },
computed: { computed: {
rangeLabel () { rangeLabel () {
if (this.rangeSelected === 0) { if (this.rangeSelected === 0 || $.isEmptyObject(this.rangeOptions)) {
return 'beliebig'; return 'beliebig';
} }
let range = this.rangeOptions[this.rangeSelected]; let range = this.rangeOptions[this.rangeSelected];
@@ -64,8 +65,8 @@
this.$emit('selected', 0); this.$emit('selected', 0);
}, },
optionSelect (value) { optionSelect (value) {
this.rangeSelected = value; this.rangeSelected = parseInt(value);
this.$emit('selected', value); this.$emit('selected', parseInt(value));
} }
}, },
watch: { watch: {
web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ProductDetail.vue
+6 -1
View File
@@ -49,7 +49,8 @@
loading: true, loading: true,
activeSection: null, activeSection: null,
singleDate: false, singleDate: false,
filterSettings: defaultFilterSettings filterSettings: defaultFilterSettings,
referringPage: null
} }
}, },
props: { props: {
@@ -190,6 +191,10 @@
if (this.$session.has('filterSettings')) { if (this.$session.has('filterSettings')) {
this.filterSettings = this.$session.get('filterSettings') this.filterSettings = this.$session.get('filterSettings')
} }
if (this.$session.has('referringPage')) {
this.referringPage = this.$session.get('referringPage');
this.$session.remove('referringPage');
}
EventBus.$on('loadDatesTable', () => { EventBus.$on('loadDatesTable', () => {
this.loadDatesView(); this.loadDatesView();
}); });
web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ReferrerLink.vue
+28
View File
@@ -0,0 +1,28 @@
<template>
<a @click="storeReferringPage()">
<slot></slot>
</a>
</template>
<script>
export default {
props: {
referringPage: {
type: Object,
default () {
return {
url: null,
label: null
}
}
}
},
methods: {
storeReferringPage () {
if (this.referringPage.url && this.referringPage.label) {
this.$session.set('referringPage', { url: this.referringPage.url, label: this.referringPage.label })
}
}
}
}
</script>
web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/SearchResult.vue
+3 -2
View File
@@ -53,8 +53,9 @@
type: Object, type: Object,
default: null default: null
}, },
referringPageUid: { referringPageUrl: {
type: Number type: String,
default: ''
}, },
argumentPrefix: { argumentPrefix: {
type: String, type: String,
web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/SearchResultItem.vue
+16 -7
View File
@@ -2,7 +2,8 @@
<div class="teaserbox teaserbox--landscape teaserbox--searchresult searchresult-item"> <div class="teaserbox teaserbox--landscape teaserbox--searchresult searchresult-item">
<div class="teaserbox__image"> <div class="teaserbox__image">
<img class="teaserbox__flag" :src="item.country.flag" :alt="item.country.name"/> <img class="teaserbox__flag" :src="item.country.flag" :alt="item.country.name"/>
<a :href="item.detailPageUri" rel="nofollow"> <referrer-link :href="item.detailPageUri" :referring-page="{ url: referringPageUrl, label: 'zurück zum Suchergebnis' }"
rel="nofollow" title="Details &amp; Buchen">
<picture class="searchresult-item__image"> <picture class="searchresult-item__image">
<source media="(max-width: 768px)" :srcset="item.hotel.images.resized.s[0].url + ' 220w'"/> <source media="(max-width: 768px)" :srcset="item.hotel.images.resized.s[0].url + ' 220w'"/>
<source media="(max-width: 1200px)" :srcset="item.hotel.images.resized.l[0].url + ' 280w'"/> <source media="(max-width: 1200px)" :srcset="item.hotel.images.resized.l[0].url + ' 280w'"/>
@@ -11,7 +12,7 @@
:title="item.hotel.images.resized.s[0].title" :title="item.hotel.images.resized.s[0].title"
:alt="item.hotel.images.resized.s[0].alt"> :alt="item.hotel.images.resized.s[0].alt">
</picture> </picture>
</a> </referrer-link>
<div class="concept-badge" :id="section.concept.code" <div class="concept-badge" :id="section.concept.code"
:class=" 'concept-badge--' + section.concept.code">{{ section.concept.name }}</div> :class=" 'concept-badge--' + section.concept.code">{{ section.concept.name }}</div>
</div> </div>
@@ -44,19 +45,21 @@
<div class="teaserbox__aside__top"> <div class="teaserbox__aside__top">
<span class="searchresult-item__label">{{ item.dates.length > 1 ? 'Zeitraum' : 'Termin' }}</span> <span class="searchresult-item__label">{{ item.dates.length > 1 ? 'Zeitraum' : 'Termin' }}</span>
<span class="searchresult-item__daterange">{{ dateRange }}</span> <span class="searchresult-item__daterange">{{ dateRange }}</span>
<a :href="item.detailPageUri" rel="nofollow" v-if="item.dates.length && !item.daytrip"> <referrer-link :href="item.detailPageUri" :referring-page="{ url: referringPageUrl, label: 'zurück zum Suchergebnis' }"
rel="nofollow" title="Details &amp; Buchen" v-if="item.dates.length && !item.daytrip">
<span class="searchresult-item__daterange"> <span class="searchresult-item__daterange">
<i class="fa fa-arrow-circle-right"></i> {{ item.dates.length }} Termin{{ item.dates.length > 1 ? 'e' : '' }} <i class="fa fa-arrow-circle-right"></i> {{ item.dates.length }} Termin{{ item.dates.length > 1 ? 'e' : '' }}
</span> </span>
</a> </referrer-link>
<hr> <hr>
<span class="searchresult-item__label">{{ item.daytrip ? 'Tageweise buchbar' : nightsOptions }}</span> <span class="searchresult-item__label">{{ item.daytrip ? 'Tageweise buchbar' : nightsOptions }}</span>
</div> </div>
<div class="teaserbox__aside__bottom"> <div class="teaserbox__aside__bottom">
<span class="searchresult-item__price">ab {{ item.minPrice }} €</span> <span class="searchresult-item__price">ab {{ item.minPrice }} €</span>
<a :href="item.detailPageUri" class="button button--full searchresult-item__button" rel="nofollow"> <referrer-link :href="item.detailPageUri" :referring-page="{ url: referringPageUrl, label: 'zurück zum Suchergebnis' }"
class="button button--full searchresult-item__button" rel="nofollow" title="Details &amp; Buchen">
Details &amp; Buchen Details &amp; Buchen
</a> </referrer-link>
</div> </div>
</div> </div>
<watchlist-toggle :uid="item.key" :watchlist="watchlist" class="teaserbox-watchlist"></watchlist-toggle> <watchlist-toggle :uid="item.key" :watchlist="watchlist" class="teaserbox-watchlist"></watchlist-toggle>
@@ -67,10 +70,12 @@
import dayjs from 'dayjs' import dayjs from 'dayjs'
import 'dayjs/locale/de' import 'dayjs/locale/de'
import WatchlistToggle from './WatchlistToggle.vue' import WatchlistToggle from './WatchlistToggle.vue'
import ReferrerLink from './ReferrerLink.vue'
export default { export default {
components: { components: {
WatchlistToggle WatchlistToggle,
ReferrerLink
}, },
props: { props: {
item: { item: {
@@ -86,6 +91,10 @@
default () { default () {
return []; return [];
} }
},
referringPageUrl: {
type: String,
default: null
} }
}, },
computed: { computed: {
web/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/TeaserWide.html
+12 -27
View File
@@ -80,48 +80,33 @@
<span class="searchresult-item__label">{f:if(condition: '{item.dates -> f:count()} > 1', then: 'Zeitraum', else: 'Termin')}</span> <span class="searchresult-item__label">{f:if(condition: '{item.dates -> f:count()} > 1', then: 'Zeitraum', else: 'Termin')}</span>
<span class="searchresult-item__daterange">{ep:dateRange(dateFrom: item.minDateStart, dateTo: item.maxDateEnd, includeLabel: 0)}</span> <span class="searchresult-item__daterange">{ep:dateRange(dateFrom: item.minDateStart, dateTo: item.maxDateEnd, includeLabel: 0)}</span>
<f:if condition="{item.dates -> f:count()} > 1"> <f:if condition="{item.dates -> f:count()} > 1">
<f:link.action <referrer-link href="{f:uri.action(pageUid: detailPage, action: 'detail', controller: 'Product', arguments: '{product: product.uid, hotel: item.hotel.uid}')}"
pageUid="{product.detailPage}" :referring-page="{ url: referringPageUrl, label: 'zurück' }"
action="detail" class="button button--full searchresult-item__button" rel="nofollow">
controller="Product"
arguments="{
product: product.uid,
hotel: item.hotel.uid,
referringPageUid: referringPageUid,
filterSettings: '{filterSettings -> ep:filterSettingsEncoder()}'
}"
additionalAttributes="{rel: 'nofollow'}"
>
<span class="searchresult-item__daterange"> <span class="searchresult-item__daterange">
<i class="fa fa-arrow-circle-right"></i> {item.dates -> f:count()} Termin{f:if(condition: '{item.dates -> f:count()} > 1', then: 'e')} <i class="fa fa-arrow-circle-right"></i> {item.dates -> f:count()} Termin{f:if(condition: '{item.dates -> f:count()} > 1', then: 'e')}
</span> </span>
</f:link.action> </referrer-link>
</f:if> </f:if>
<hr> <hr>
<span class="searchresult-item__label">{ep:nightsOptions(options: item.nights)}</span> <span class="searchresult-item__label">{ep:nightsOptions(options: item.nights)}</span>
</div> </div>
<div class="teaserbox__aside__bottom"> <div class="teaserbox__aside__bottom">
<span class="searchresult-item__price">ab {item.minPrice} €</span> <span class="searchresult-item__price">ab {item.minPrice} €</span>
<f:link.action <referrer-link href="{f:uri.action(pageUid: detailPage, action: 'detail', controller: 'Product', arguments: '{product: product.uid, hotel: item.hotel.uid}')}"
pageUid="{product.detailPage}" :referring-page="{ url: referringPageUrl, label: 'zurück' }"
action="detail" class="button button--full searchresult-item__button" rel="nofollow">
controller="Product" Details &amp; Buchen
arguments="{product: product.uid, hotel: item.hotel.uid, referringPageUid: referringPageUid, filterSettings: '{filterSettings -> ep:filterSettingsEncoder()}'}" </referrer-link>
class="button button--full searchresult-item__button"
additionalAttributes="{rel: 'nofollow'}">Details &amp; Buchen</f:link.action>
</div> </div>
</f:then> </f:then>
<f:else> <f:else>
<div class="teaserbox__aside__top">&nbsp;</div> <div class="teaserbox__aside__top">&nbsp;</div>
<div class="teaserbox__aside__bottom"> <div class="teaserbox__aside__bottom">
<span class="searchresult-item__price">ausgebucht</span> <span class="searchresult-item__price">ausgebucht</span>
<f:link.action <referrer-link href="{f:uri.action(pageUid: detailPage, action: 'detail', controller: 'Product', arguments: '{product: product.uid, hotel: item.hotel.uid}')}"
pageUid="{product.detailPage}" :referring-page="{ url: referringPageUrl, label: 'zurück' }"
action="detail" class="button button--full searchresult-item__button" rel="nofollow">Details</referrer-link>
controller="Product"
arguments="{product: product.uid, hotel: item.hotel.uid, referringPageUid: referringPageUid, filterSettings: '{filterSettings -> ep:filterSettingsEncoder()}'}"
class="button button--full searchresult-item__button"
additionalAttributes="{rel: 'nofollow'}">Details</f:link.action>
</div> </div>
</f:else> </f:else>
</f:if> </f:if>
web/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/HeaderDetail.html
+2 -14
View File
@@ -60,20 +60,8 @@
</f:link.typolink> </f:link.typolink>
</f:if> </f:if>
</div> </div>
<f:if condition="{referringPageUid}"> <div class="ep-backlink" v-if="referringPage" v-cloak>
<div class="ep-backlink"> <a :href="referringPage.url">{{ referringPage.label }}</a>
<f:if condition="{referringPageUid} == {settings.defaultSearchPageUid}">
<f:then>
<f:link.action pageUid="{referringPageUid}"
action="searchresult"
controller="Search"
arguments="{filterSettings: '{filterSettings -> ep:filterSettingsEncoder()}'}">zurück zum Suchergebnis</f:link.action>
</f:then>
<f:else>
<f:link.typolink parameter="{referringPageUid}">zurück</f:link.typolink>
</f:else>
</f:if>
</div> </div>
</f:if>
{v:render.template(file: 'EXT:ep_theme/Resources/Private/Partials/Breadcrumb.html')} {v:render.template(file: 'EXT:ep_theme/Resources/Private/Partials/Breadcrumb.html')}
</div> </div>
web/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html
+5 -3
View File
@@ -7,8 +7,6 @@
<f:layout name="Default"/> <f:layout name="Default"/>
<f:section name="Main"> <f:section name="Main">
<f:render partial="Product/HeaderDetail" arguments="{_all}"/>
<div class="container" id="detail">
<noscript><h1>{product.headline}</h1></noscript> <noscript><h1>{product.headline}</h1></noscript>
<product-detail <product-detail
:uris='{ :uris='{
@@ -23,6 +21,9 @@
:watchlist="watchlist" :watchlist="watchlist"
:daytrip="{product.daytrip -> v:variable.convert(type: 'int')}" :daytrip="{product.daytrip -> v:variable.convert(type: 'int')}"
inline-template> inline-template>
<article>
<f:render partial="Product/HeaderDetail" arguments="{_all}"/>
<div class="container" id="detail">
<div class="product-detail-wrapper"> <div class="product-detail-wrapper">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
@@ -233,9 +234,10 @@
</div> </div>
</div> </div>
<facebook-pixel :values="{ content_ids: [ fbPixelData.productUid ], content_name: fbPixelData.nameInternal, content_type: 'product' }"></facebook-pixel> <facebook-pixel :values="{ content_ids: [ fbPixelData.productUid ], content_name: fbPixelData.nameInternal, content_type: 'product' }"></facebook-pixel>
</div> </article>
</product-detail> </product-detail>
</div> </div>
</div>
<f:render partial="Faq" arguments="{faqs: product.faqs, settings: settings}"/> <f:render partial="Faq" arguments="{faqs: product.faqs, settings: settings}"/>
</f:section> </f:section>
web/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/HotelList.html
+8 -1
View File
@@ -5,6 +5,11 @@
<f:layout name="Default"/> <f:layout name="Default"/>
<f:section name="Main"> <f:section name="Main">
<hotel-list
:watchlist="watchlist"
referring-page-url="{f:uri.typolink(parameter: currentPageUid)}"
inline-template>
<article>
<f:render partial="Product/HeaderDetail" arguments="{_all}"/> <f:render partial="Product/HeaderDetail" arguments="{_all}"/>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
@@ -32,7 +37,7 @@
<f:render partial="Hotel/TeaserWide" section="Teaser" arguments="{ <f:render partial="Hotel/TeaserWide" section="Teaser" arguments="{
item: item, item: item,
product: product, product: product,
referringPageUid: referringPageUid referringPageUrl: referringPageUrl
}"/> }"/>
</f:for> </f:for>
</f:then> </f:then>
@@ -47,6 +52,8 @@
</div> </div>
</div> </div>
</div> </div>
</article>
</hotel-list>
</f:section> </f:section>
</html> </html>
web/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchresult.html
+21 -8
View File
@@ -10,7 +10,7 @@
<search-result <search-result
results-uri="{ep:uri.ajax(action: 'searchresult', controller: 'AjaxSearch', pageUid: settings.defaultAjaxUid, format: 'json')}" results-uri="{ep:uri.ajax(action: 'searchresult', controller: 'AjaxSearch', pageUid: settings.defaultAjaxUid, format: 'json')}"
:initial-filter-settings='<v:format.json.encode>{filterSettings}</v:format.json.encode>' :initial-filter-settings='<v:format.json.encode>{filterSettings}</v:format.json.encode>'
:referring-page-uid="{referringPageUid}" referring-page-url="{f:uri.typolink(parameter: referringPageUid)}"
argument-prefix="{ep:argumentPrefix(pluginName: 'ajax')}" argument-prefix="{ep:argumentPrefix(pluginName: 'ajax')}"
:date-presets='{settings.datePickerPresets -> v:format.json.encode()}' :date-presets='{settings.datePickerPresets -> v:format.json.encode()}'
:watchlist="watchlist" :watchlist="watchlist"
@@ -105,7 +105,8 @@
<div class="panel-heading" role="tab" id="headingPeriod"> <div class="panel-heading" role="tab" id="headingPeriod">
<h4 class="panel-title"> <h4 class="panel-title">
<a role="button" data-toggle="collapse" href="#collapsePeriod" <a role="button" data-toggle="collapse" href="#collapsePeriod"
aria-expanded="true" aria-controls="collapsePeriod" class="collapsed"> aria-expanded="true" aria-controls="collapsePeriod"
:class="{ collapsed: !filterSettings.dateFrom && !filterSettings.dateTo }">
Reisezeitraum Reisezeitraum
</a> </a>
</h4> </h4>
@@ -149,12 +150,14 @@
<div class="panel-heading" role="tab" id="headingDuration"> <div class="panel-heading" role="tab" id="headingDuration">
<h4 class="panel-title"> <h4 class="panel-title">
<a role="button" data-toggle="collapse" href="#collapseDuration" <a role="button" data-toggle="collapse" href="#collapseDuration"
aria-expanded="true" aria-controls="collapseDuration" class="collapsed"> aria-expanded="true" aria-controls="collapseDuration"
:class="{ collapsed: filterSettings.priceRange === 0 }">
Preis Preis
</a> </a>
</h4> </h4>
</div> </div>
<div id="collapseDuration" class="panel-collapse collapse" role="tabpanel" <div id="collapseDuration" class="panel-collapse collapse" role="tabpanel"
:class="{ in: filterSettings.priceRange > 0 }"
aria-labelledby="headingDuration"> aria-labelledby="headingDuration">
<div class="panel-body"> <div class="panel-body">
<div class="form-group"> <div class="form-group">
@@ -171,12 +174,14 @@
<div class="panel-heading" role="tab" id="headingPax"> <div class="panel-heading" role="tab" id="headingPax">
<h4 class="panel-title"> <h4 class="panel-title">
<a role="button" data-toggle="collapse" href="#collapsePax" <a role="button" data-toggle="collapse" href="#collapsePax"
aria-expanded="true" aria-controls="collapsePax" class="collapsed"> aria-expanded="true" aria-controls="collapsePax"
:class="{ collapsed: filterSettings.pax === 1 }">
Personen Personen
</a> </a>
</h4> </h4>
</div> </div>
<div id="collapsePax" class="panel-collapse collapse" role="tabpanel" <div id="collapsePax" class="panel-collapse collapse" role="tabpanel"
:class="{ in: filterSettings.pax > 1 }"
aria-labelledby="headingPax"> aria-labelledby="headingPax">
<div class="panel-body"> <div class="panel-body">
<div class="form-group"> <div class="form-group">
@@ -193,12 +198,14 @@
<div class="panel-heading" role="tab" id="headingHotel"> <div class="panel-heading" role="tab" id="headingHotel">
<h4 class="panel-title"> <h4 class="panel-title">
<a role="button" data-toggle="collapse" href="#collapseHotel" <a role="button" data-toggle="collapse" href="#collapseHotel"
aria-expanded="true" aria-controls="collapseHotel" class="collapsed"> aria-expanded="true" aria-controls="collapseHotel"
:class="{ collapsed: !filterSettings.hotelTypes.length }">
Unterkunft Unterkunft
</a> </a>
</h4> </h4>
</div> </div>
<div id="collapseHotel" class="panel-collapse collapse" role="tabpanel" <div id="collapseHotel" class="panel-collapse collapse" role="tabpanel"
:class="{ in: filterSettings.hotelTypes.length }"
aria-labelledby="headingHotel"> aria-labelledby="headingHotel">
<div class="panel-body"> <div class="panel-body">
<div class="form-group"> <div class="form-group">
@@ -213,12 +220,14 @@
<div class="panel-heading" role="tab" id="headingBoard"> <div class="panel-heading" role="tab" id="headingBoard">
<h4 class="panel-title"> <h4 class="panel-title">
<a role="button" data-toggle="collapse" href="#collapseBoard" <a role="button" data-toggle="collapse" href="#collapseBoard"
aria-expanded="true" aria-controls="collapseBoard" class="collapsed"> aria-expanded="true" aria-controls="collapseBoard"
:class="{ collapsed: !filterSettings.boardTypes.length }">
Verpflegung Verpflegung
</a> </a>
</h4> </h4>
</div> </div>
<div id="collapseBoard" class="panel-collapse collapse" role="tabpanel" <div id="collapseBoard" class="panel-collapse collapse" role="tabpanel"
:class="{ in: filterSettings.boardTypes.length }"
aria-labelledby="headingBoard"> aria-labelledby="headingBoard">
<div class="panel-body"> <div class="panel-body">
<div class="form-group"> <div class="form-group">
@@ -233,12 +242,14 @@
<div class="panel-heading" role="tab" id="headingRoomtype"> <div class="panel-heading" role="tab" id="headingRoomtype">
<h4 class="panel-title"> <h4 class="panel-title">
<a role="button" data-toggle="collapse" href="#collapseRoomtype" <a role="button" data-toggle="collapse" href="#collapseRoomtype"
aria-expanded="true" aria-controls="collapseRoomtype" class="collapsed"> aria-expanded="true" aria-controls="collapseRoomtype"
:class="{ collapsed: !filterSettings.roomTypes.length }">
Zimmerarten / Apart. Zimmerarten / Apart.
</a> </a>
</h4> </h4>
</div> </div>
<div id="collapseRoomtype" class="panel-collapse collapse" role="tabpanel" <div id="collapseRoomtype" class="panel-collapse collapse" role="tabpanel"
:class="{ in: filterSettings.roomTypes.length }"
aria-labelledby="headingRoomtype"> aria-labelledby="headingRoomtype">
<div class="panel-body"> <div class="panel-body">
<div class="form-group"> <div class="form-group">
@@ -253,7 +264,8 @@
<div class="panel-heading" role="tab" id="headingBus"> <div class="panel-heading" role="tab" id="headingBus">
<h4 class="panel-title"> <h4 class="panel-title">
<a role="button" data-toggle="collapse" href="#collapseBus" <a role="button" data-toggle="collapse" href="#collapseBus"
aria-expanded="true" aria-controls="collapseBus" class="collapsed"> aria-expanded="true" aria-controls="collapseBus"
:class="{ collapsed: !filterSettings.bus }">
Anreise Anreise
</a> </a>
</h4> </h4>
@@ -291,6 +303,7 @@
:key="item.key" :key="item.key"
:item="item" :item="item"
:section="section" :section="section"
:referring-page-url="referringPageUrl"
:watchlist="watchlist"></search-result-item> :watchlist="watchlist"></search-result-item>
</div> </div>
</template> </template>