+ Die Anfrage ist bei uns eingegangen und wird schnellstmöglich bearbeitet. Wir melden uns telefonisch
+ oder per Mail bei euch.
+
@@ -144,17 +222,38 @@
v-show="formErrors.name"
v-html="formErrors.name">
-
- Vielen Dank für Deine {{ mode === 'booking' ? 'Buchung' : 'Anfrage' }}. Wir werden diese schnellstmöglich bearbeiten.
-
![]()
![]()
@@ -292,19 +388,19 @@ export default {
type: Number,
default: 2.9,
},
- undersubscriptionEur: {
+ undersubscription30Eur: {
type: Number,
default: 5.0,
},
- undersubscriptionChf: {
+ undersubscription30Chf: {
type: Number,
default: 5.0,
},
- undersubscriptionExtEur: {
+ undersubscription40Eur: {
type: Number,
default: 2.5,
},
- undersubscriptionExtChf: {
+ undersubscription40Chf: {
type: Number,
default: 2.5,
},
@@ -334,6 +430,14 @@ export default {
type: Number,
default: 5,
},
+ taxLabel: {
+ type: String,
+ default: 'zzgl. vor Ort zu entrichtender Ortstaxe',
+ },
+ adolescentsAge: {
+ type: Number,
+ default: 0,
+ }
},
data() {
return {
@@ -348,16 +452,26 @@ export default {
selectedTo: null,
selectedRange: [],
selectedPax: 30,
+ childrenCount: 0,
+ minorsCount: 0,
+ adolescentsCount: 0,
selectedOptions: [],
selectedBoard: null,
- name: null,
- email: null,
- phone: null,
- remarks: null,
- group: null,
- address: null,
+ name: '',
+ email: '',
+ phone: '',
+ remarks: '',
+ group: '',
+ street: '',
+ postcode: '',
+ city: '',
mode: 'booking',
confirmation: false,
+ termsUrls: {
+ AT: 'https://www.ep-reisen.de/fileadmin/user_upload/allgemein/AGB_Gruppen/AGB_Gruppen_CLLT_Touristik_GmbH.pdf',
+ CH: 'https://www.ep-reisen.de/fileadmin/user_upload/allgemein/AGB_Gruppen/AVB_Gruppen_AlpineVacation_GmbH.pdf',
+ IT: 'https://www.ep-reisen.de/fileadmin/user_upload/allgemein/AGB_Gruppen/AGB_Gruppen_E_P_Reisen.pdf',
+ }
}
},
methods: {
@@ -380,6 +494,28 @@ export default {
return price
},
+ calculateOptionPrice(option) {
+ let price = {
+ EUR: 0,
+ CHF: 0,
+ };
+ let optionPriceEUR = option.price.EUR
+ let optionPriceCHF = option.price.CHF
+ if (1 === option.type) {
+ price.EUR = optionPriceEUR;
+ price.CHF = optionPriceCHF;
+ } else if (2 === option.type) {
+ price.EUR = optionPriceEUR * this.paxCount;
+ price.CHF = optionPriceCHF * this.paxCount;
+ } else if (3 === option.type) {
+ price.EUR = optionPriceEUR * this.nightsCount;
+ price.CHF = optionPriceCHF * this.nightsCount;
+ } else if (4 === option.type) {
+ price.EUR = optionPriceEUR * this.nightsCount * this.paxCount;
+ price.CHF = optionPriceCHF * this.nightsCount * this.paxCount;
+ }
+ return price;
+ },
formatOptionPriceType(option) {
if (2 === option.type) {
return ` (${this.formatCurrency(option.price)} pro Person)`
@@ -431,13 +567,19 @@ export default {
'tx_epproducts_ajax[groupsPriceInquiry][confirmation]': confirmation ? '1' : '0',
'tx_epproducts_ajax[groupsPriceInquiry][name]': this.name ? this.name : '',
'tx_epproducts_ajax[groupsPriceInquiry][group]': this.group ? this.group : '',
- 'tx_epproducts_ajax[groupsPriceInquiry][address]': this.address ? this.address : '',
+ 'tx_epproducts_ajax[groupsPriceInquiry][street]': this.street ? this.street : '',
+ 'tx_epproducts_ajax[groupsPriceInquiry][postcode]': this.postcode ? this.postcode : '',
+ 'tx_epproducts_ajax[groupsPriceInquiry][city]': this.city ? this.city : '',
'tx_epproducts_ajax[groupsPriceInquiry][email]': this.email? this.email : '',
'tx_epproducts_ajax[groupsPriceInquiry][phone]': this.phone ? this.phone : '',
'tx_epproducts_ajax[groupsPriceInquiry][remarks]': this.remarks,
'tx_epproducts_ajax[groupsPriceInquiry][dateFrom]': this.selectedFrom.format('DD.MM.YYYY'),
'tx_epproducts_ajax[groupsPriceInquiry][dateTo]': this.selectedTo.format('DD.MM.YYYY'),
+ 'tx_epproducts_ajax[groupsPriceInquiry][nights]': this.nightsCount,
'tx_epproducts_ajax[groupsPriceInquiry][pax]': this.selectedPax,
+ 'tx_epproducts_ajax[groupsPriceInquiry][children]': this.childrenCount,
+ 'tx_epproducts_ajax[groupsPriceInquiry][minors]': this.minorsCount,
+ 'tx_epproducts_ajax[groupsPriceInquiry][adolescents]': this.adolescentsCount,
'tx_epproducts_ajax[groupsPriceInquiry][summary][paxBase]': this.formatCurrency(this.pricePax.base),
'tx_epproducts_ajax[groupsPriceInquiry][summary][paxAdditional]': this.formatCurrency(this.pricePax.additional),
'tx_epproducts_ajax[groupsPriceInquiry][summary][undersubscription]': this.formatCurrency(this.pricePax.undersubscription),
@@ -474,6 +616,21 @@ export default {
},
},
computed: {
+ isSelfCatering() {
+ let selectedBoard = this.selectedBoard
+ if (null === selectedBoard) {
+ return false
+ }
+ if ('CH' === this.countryCode) {
+ return selectedBoard.price.CHF === 0
+ } else {
+ return selectedBoard.price.EUR === 0
+ }
+ },
+ paxCount() {
+ // subtract number of children from pax for price calculation, but minimum 30 pax
+ return Math.max(this.selectedPax - this.childrenCount, 30)
+ },
nightsCount() {
return this.selectedRange.length;
},
@@ -506,20 +663,20 @@ export default {
base.EUR += config.price.EUR
base.CHF += config.price.CHF
let included = config.personsIncluded
- let additionalPax = this.selectedPax - included
- if (this.selectedPax > included) {
+ if (this.paxCount > included) {
+ let additionalPax = this.paxCount - included
additional.EUR += additionalPax * config.priceAdditionalPerson.EUR
additional.CHF += additionalPax * config.priceAdditionalPerson.CHF
}
}
}
}
- if (this.selectedBoard && this.selectedPax < 40) {
- undersubscription.EUR = this.selectedPax * this.undersubscriptionEur * this.selectedRange.length
- undersubscription.CHF = this.selectedPax * this.undersubscriptionChf * this.selectedRange.length
- } else if (this.selectedBoard && this.selectedPax < 50) {
- undersubscription.EUR = this.selectedPax * this.undersubscriptionExtEur * this.selectedRange.length
- undersubscription.CHF = this.selectedPax * this.undersubscriptionExtChf * this.selectedRange.length
+ if (false === this.isSelfCatering && this.paxCount < 40) {
+ undersubscription.EUR = this.paxCount * this.undersubscription30Eur * this.selectedRange.length
+ undersubscription.CHF = this.paxCount * this.undersubscription30Chf * this.selectedRange.length
+ } else if (false === this.isSelfCatering && this.paxCount < 50) {
+ undersubscription.EUR = this.paxCount * this.undersubscription40Eur * this.selectedRange.length
+ undersubscription.CHF = this.paxCount * this.undersubscription40Chf * this.selectedRange.length
}
return {base, additional, undersubscription}
@@ -530,21 +687,9 @@ export default {
CHF: 0,
};
for (let option of this.selectedOptions) {
- let optionPriceEUR = option.price.EUR
- let optionPriceCHF = option.price.CHF
- if (1 === option.type) {
- price.EUR += optionPriceEUR;
- price.CHF += optionPriceCHF;
- } else if (2 === option.type) {
- price.EUR += optionPriceEUR * this.selectedPax;
- price.CHF += optionPriceCHF * this.selectedPax;
- } else if (3 === option.type) {
- price.EUR += optionPriceEUR * this.nightsCount;
- price.CHF += optionPriceCHF * this.nightsCount;
- } else if (4 === option.type) {
- price.EUR += optionPriceEUR * this.nightsCount * this.selectedPax;
- price.CHF += optionPriceCHF * this.nightsCount * this.selectedPax;
- }
+ let optionPrice = this.calculateOptionPrice(option)
+ price.EUR += optionPrice.EUR;
+ price.CHF += optionPrice.CHF;
}
return price;
},
@@ -554,8 +699,8 @@ export default {
CHF: 0,
}
if (this.selectedBoard) {
- price.EUR = this.selectedBoard.price.EUR * this.nightsCount * this.selectedPax;
- price.CHF = this.selectedBoard.price.CHF * this.nightsCount * this.selectedPax;
+ price.EUR = this.selectedBoard.price.EUR * this.nightsCount * this.paxCount;
+ price.CHF = this.selectedBoard.price.CHF * this.nightsCount * this.paxCount;
}
return price
},
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Forms/ContactForm.form.yaml b/public/typo3conf/ext/ep_theme/Resources/Private/Forms/ContactForm.form.yaml
index a9394c68..3a0ec95b 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Forms/ContactForm.form.yaml
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Forms/ContactForm.form.yaml
@@ -121,6 +121,11 @@ renderables:
type: Textarea
identifier: message
label: 'Deine Kontaktanfrage'
+ -
+ defaultValue: ''
+ type: Text
+ identifier: bookingNumber
+ label: 'Buchungsnummer (falls vorhanden)'
-
type: LinkedCheckbox
identifier: privacypolicyaccepted
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Language/locallang.xlf b/public/typo3conf/ext/ep_theme/Resources/Private/Language/locallang.xlf
index 8fe41e0c..8c0d32c3 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Language/locallang.xlf
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Language/locallang.xlf
@@ -87,12 +87,21 @@
Bitte angeben
-
+
+ Bitte angeben
+
+
+ Bitte angeben
+
+
Bitte angeben
Bitte angeben
+
+ Bitte auswählen
+
Bitte angeben
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Email/SystemEmail.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Email/SystemEmail.html
index 829dd037..bd3f29f4 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Email/SystemEmail.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Email/SystemEmail.html
@@ -264,6 +264,10 @@
font-weight:normal;
text-decoration:underline;
}
+ table.data th,
+ table.data td {
+ vertical-align: top;
+ }
@media only screen and (min-width:768px){
.templateContainer {
width:600px !important;
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Detail.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Detail.html
index ac0416cb..4740ca8a 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Detail.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Detail.html
@@ -4,14 +4,20 @@
+
-
-
-
-
-
-
-
+
+
+
+
+
+