Merge branch 'master' into develop

This commit is contained in:
Björn Fromme
2019-08-21 11:36:54 +02:00
4 changed files with 9 additions and 54 deletions
@@ -79,9 +79,6 @@ class AjaxViewHelper extends ActionViewHelper
// Force absolute urls
$arguments['absolute'] = true;
// Add timestamp as additional argument to prevent caching
$arguments['additionalParams'] = ['t' => time()];
return parent::renderStatic(
$arguments,
$renderChildrenClosure,
@@ -17,8 +17,6 @@
import dayjs from 'dayjs'
import 'dayjs/locale/de'
import defaultFilterSettings from '../_filtersettings'
export default {
components: {
DatesTable,
@@ -51,7 +49,6 @@
loading: false,
activeSection: null,
singleDate: false,
filterSettings: defaultFilterSettings,
referringPage: null
}
},
@@ -92,12 +89,9 @@
this.datesShow = true;
this.priceTableShow = false;
this.detailShow = false;
let query = {};
query[this.argumentPrefix + '[filterSettings]'] = this.filterSettings;
axios({
url: this.uris['dates'],
method: 'post',
data: $.param(query)
method: 'post'
}).then(response => {
const json = response.data;
if (json.dates.length === 1) {
@@ -116,33 +110,6 @@
EventBus.$emit('tableLoaded');
});
},
loadSelectableDates () {
this.loading = true;
this.datesShow = true;
this.priceTableShow = false;
this.detailShow = false;
let query = {};
query[this.argumentPrefix + '[product]'] = this.filterSettings;
axios({
url: this.uris['dateslist'],
method: 'post',
data: $.param(query)
}).then(response => {
const json = response.data;
if (json.dates.length === 1) {
this.singleDate = true;
let dateRow = json.dates[0];
this.loadPriceTableView(dateRow.dateUid);
} else {
this.singleDate = false;
this.datesRows = json.dates;
this.bookable = json.bookable;
this.altLabel = json.altLabel;
this.altProductLink = json.altProductLink;
this.loading = false;
}
});
},
loadDatesView (scroll = true) {
if (this.daytrip) {
this.loading = false;
@@ -161,7 +128,6 @@
this.priceTableShow = true;
this.detailShow = false;
let query = {};
query[this.argumentPrefix + '[filterSettings]'] = this.filterSettings;
query[this.argumentPrefix + '[date]'] = dateUid;
axios({
url: this.uris['pricetable'],
@@ -225,9 +191,6 @@
}
},
created () {
if (sessionStorage.getItem('filterSettings')) {
this.filterSettings = JSON.parse(sessionStorage.getItem('filterSettings'));
}
if (sessionStorage.getItem('referringPage')) {
this.referringPage = JSON.parse(sessionStorage.getItem('referringPage'));
sessionStorage.removeItem('referringPage');