Merge tag '2019.08.001' into develop

2019.08.001
2019-08-15 15:09:15 +02:00
parent 7c21ed354f efa6d748f4
commit 24c40e4928
11 changed files with 216 additions and 202 deletions
@@ -0,0 +1 @@
+{"name":"E&P Skireisen","short_name":"E&P Skireisen","start_url":"/","display":"standalone","gcm_sender_id":"890396972010","gcm_user_visible_only":true}
@@ -0,0 +1 @@
+importScripts('https://static.cleverpush.com/channel/worker/MrDvZ9L2bngnLfnq9.js' + self.location.search);
@@ -5,6 +5,7 @@ imports:

 editor:
  config:
+    disableNativeSpellChecker: false
    contentsCss:
    - "EXT:ep_events/Resources/Public/css/rte.min.css"

@@ -25,7 +25,7 @@
                            </div>
                            <f:render partial="FormBoxBottom"/>
                        </div>
-                        <v:menu levels="1" entryLevel="2">
+                        <v:menu levels="1" entryLevel="2" titleFields="title">
                            <div class="box">
                                <f:render partial="FormBoxTop"/>
                                <div class="box__content">
@@ -144,6 +144,7 @@ class ProductController extends ActionController
            'product' => $product,
            'isProductWithExcludedConcept' => $isProductWithExcludedConcept,
            'isProductWithNoInfoConcept' => $isProductWithNoInfoConcept,
+            'currentPageUid' => $GLOBALS['TSFE']->id,
        ]);
    }

@@ -47,6 +47,7 @@ class Hotel
        $hotel['category'] = \EP\EpProducts\Domain\Model\Hotel::$categoryLabels[$entity->getCategory()];
        $hotel['type'] = \EP\EpProducts\Domain\Model\Hotel::$typeLabels[$entity->getType()];
        $hotel['description'] = SerializationUtility::sanitizeText($entity->getDescription());
+        $hotel['roomtypes'] = SerializationUtility::sanitizeText($entity->getRoomTypes());
        $hotel['features'] = SerializationUtility::sanitizeText($entity->getFeatures());
        $hotel['images']['image'] = SerializationUtility::preprocessImages($entity->getResellerImages());

@@ -5,6 +5,7 @@ imports:

 editor:
  config:
+    disableNativeSpellChecker: false
    contentsCss:
    - "EXT:ep_theme/Resources/Public/css/rte.css"

@@ -300,7 +300,6 @@ new Vue({
            $window.on('resize', () => {
                this.setMobileMode();
                this.initCarousels();
-                this.initFilterpanel();
                this.initDropdownMenuBehavior();
                let newBackgroundImageMode = this.getBackgroundImageMode();
                if (this.backgroundImageMode !== newBackgroundImageMode) {
@@ -175,7 +175,9 @@
                                <div v-cloak v-show="!loading && priceTableShow">
                                    <price-table :price-table-rows="priceTableRows" :services-included="servicesIncluded"
                                                 :date-label="dateLabel" :single-date="singleDate"></price-table>
-                                    <f:render partial="Product/Details" arguments="{_all}"/>
+                                    <f:alias map="{currentPageUid: 1}">
+                                        <f:render partial="Product/Details" arguments="{_all}"/>
+                                    </f:alias>
                                </div>
                                <!-- /Prices -->
                                <!-- Hotel -->
@@ -99,6 +99,10 @@
                        <label class="control-label">Ausstattung</label>
                        <textarea rows="5" class="form-control" onclick="this.select()">{hotel.features}</textarea>
                    </div>
+                    <div class="form-group">
+                        <label class="control-label">Zimmerarten/Appartmentbeschreibung</label>
+                        <textarea rows="5" class="form-control" onclick="this.select()">{hotel.roomtypes}</textarea>
+                    </div>
                    <h4>Termine, Zimmer, Leistungen und Zustiege</h4>
                    <f:if condition="{hotel.dates.date}">
                        <f:then>
				`@@ -0,0 +1 @@`
				`{"name":"E&P Skireisen","short_name":"E&P Skireisen","start_url":"/","display":"standalone","gcm_sender_id":"890396972010","gcm_user_visible_only":true}`
				`@@ -0,0 +1 @@`
				`importScripts('https://static.cleverpush.com/channel/worker/MrDvZ9L2bngnLfnq9.js' + self.location.search);`