Merge branch 'develop'

public/typo3conf/ext/ep_products/Classes/Domain/Model/Product.php

@@ -145,6 +145,11 @@ class Product extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity implements
      */
     protected $additionalServices = '';
 
+    /**
+     * @var string
+     */
+    protected $includedServices;
+
     /**
      * @var string
      */
@@ -646,6 +651,22 @@ class Product extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity implements
         $this->additionalServices = $additionalServices;
     }
 
+    /**
+     * @return string
+     */
+    public function getIncludedServices()
+    {
+        return $this->includedServices;
+    }
+
+    /**
+     * @param string $includedServices
+     */
+    public function setIncludedServices($includedServices)
+    {
+        $this->includedServices = $includedServices;
+    }
+
     /**
      * @return string
      */

public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_product.php

@@ -27,7 +27,7 @@ return [
             'showitem' => '--palette--;;top, name_internal, --palette--;;name, --palette--;;header,
                     --palette--;;destinations, --palette--;;misc, --palette--;Alternative;alternative,
                 --div--;Texte, teaser, teaser_long, concept_description, board_description, additional_services,
-                    programme_description, ski_pass_description,
+                    included_services, programme_description, ski_pass_description,
                 --div--;Verknüpfungen, --palette--;;records, hotels, facts, faqs, additional_regions,
                 --div--;Bilder/Dateien, teaser_images, header_images, images, reseller_images, banner, video,
                 --div--;Bewertung, --palette--;;rating, testimonials,
@@ -341,6 +341,17 @@ return [
                 'enableRichtext' => true,
             ],
         ],
+        'included_services' => [
+            'exclude' => 0,
+            'label' => 'Inklusivleistungen (Gruppen)',
+            'config' => [
+                'type' => 'text',
+                'cols' => 40,
+                'rows' => 5,
+                'eval' => 'trim',
+                'enableRichtext' => true,
+            ],
+        ],
         'programme_description' => [
             'exclude' => 0,
             'label' => 'Programm',

public/typo3conf/ext/ep_products/ext_tables.sql

@@ -34,6 +34,7 @@ CREATE TABLE tx_epproducts_domain_model_product
     concept_description   text                            NOT NULL,
     board_description     text                            NOT NULL,
     additional_services   text                            NOT NULL,
+    included_services     text                            NOT NULL,
     programme_description text                            NOT NULL,
     ski_pass_description  text                            NOT NULL,
     rating_average        varchar(255)        DEFAULT ''  NOT NULL,

public/typo3conf/ext/ep_theme/Configuration/RTE/Minimal.yaml

@@ -0,0 +1,31 @@
+imports:
+  - { resource: "EXT:rte_ckeditor/Configuration/RTE/Processing.yaml" }
+  - { resource: "EXT:rte_ckeditor/Configuration/RTE/Editor/Base.yaml" }
+  - { resource: "EXT:rte_ckeditor/Configuration/RTE/Editor/Plugins.yaml" }
+
+editor:
+  config:
+    height: 100
+    disableNativeSpellChecker: false
+    contentsCss:
+      - "EXT:ep_theme/Resources/Public/css/rte.css?v=2020.02-01"
+
+    stylesSet:
+      - { name: "Button", element: "a", attributes: { 'class': 'button' } }
+
+    toolbarGroups:
+      - { name: paragraph, groups: [ list] }
+      - "/"
+      - { name: links, groups: [ links ] }
+      - { name: tools, groups: [ specialchar ] }
+      - { name: document, groups: [ mode ] }
+
+    format_tags: "p;h1;h2;h3;h4"
+
+    removePlugins:
+      - image
+
+    removeButtons:
+      - Anchor
+      - Underline
+      - Strike

public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/RTE.tsconfig

@@ -12,5 +12,8 @@ RTE {
                 }
             }
         }
+        tx_epproducts_domain_model_product {
+            included_services.preset = ep-minimal
+        }
     }
 }

public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Details.html

@@ -21,6 +21,30 @@
         </div>
         {product.boardDescription -> f:format.html()}
     </div>
+    <f:if condition="{product.includedServices}">
+        <div class="relative odd:bg-gray-50 p-4" data-rte-content>
+            <div class="headline--3 headline--underlined">
+                Inklusivleistungen
+            </div>
+            {product.includedServices -> f:format.html()}
+            <f:if condition="{product.minPrice}">
+                <div class="absolute top-0 right-0 mt-4 mr-4 w-32 transform rotate-6">
+                    <svg viewBox="0 0 200 200"
+                         xmlns="http://www.w3.org/2000/svg"
+                         preserveAspectRatio="xMinYMin meet"
+                         class="w-full h-full">
+                        <circle fill="currentColor" class="text-ep-primary-50" cx="100" cy="100" r="100"/>
+                        <circle fill="currentColor" class="text-ep-primary" cx="100" cy="100" r="70"/>
+                    </svg>
+                    <div class="absolute top-0 left-0 inset-0 flex flex-col items-center justify-center p-8">
+                        <span class="block text-center text-white uppercase font-bold leading-none text-xl">
+                            ab<br>{product.minPrice} €
+                        </span>
+                    </div>
+                </div>
+            </f:if>
+        </div>
+    </f:if>
     <f:if condition="{product.additionalServices}">
         <div class="odd:bg-gray-50 p-4" data-rte-content>
             <div class="headline--3 headline--underlined">

public/typo3conf/ext/ep_theme/ext_localconf.php

@@ -44,6 +44,7 @@ $boot = function () {
 
     $GLOBALS['TYPO3_CONF_VARS']['RTE']['Presets']['default'] = 'EXT:ep_theme/Configuration/RTE/Default.yaml';
     $GLOBALS['TYPO3_CONF_VARS']['RTE']['Presets']['ep-reisen'] = 'EXT:ep_theme/Configuration/RTE/Default.yaml';
+    $GLOBALS['TYPO3_CONF_VARS']['RTE']['Presets']['ep-minimal'] = 'EXT:ep_theme/Configuration/RTE/Minimal.yaml';
 
     $GLOBALS['TYPO3_CONF_VARS']['SYS']['fluid']['namespaces']['ep'] = ['EP\\EpTheme\\ViewHelpers'];
     $GLOBALS['TYPO3_CONF_VARS']['MAIL']['layoutRootPaths'][700] = 'EXT:ep_theme/Resources/Private/Layouts/Email/';