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

Merge branch 'release/2022.03-03'

Browse Source
This commit is contained in:
Björn Fromme
2022-03-30 15:03:13 +02:00
parent b0f7457041 696ac5d33f
commit 8581fc435c
8 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+12 -12
View File
@@ -1148,16 +1148,16 @@
}, },
{ {
"name": "guzzlehttp/psr7", "name": "guzzlehttp/psr7",
"version": "1.8.3", "version": "1.8.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/psr7.git", "url": "https://github.com/guzzle/psr7.git",
"reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85" "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/1afdd860a2566ed3c2b0b4a3de6e23434a79ec85", "url": "https://api.github.com/repos/guzzle/psr7/zipball/337e3ad8e5716c15f9657bd214d16cc5e69df268",
"reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85", "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1238,7 +1238,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/psr7/issues", "issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/1.8.3" "source": "https://github.com/guzzle/psr7/tree/1.8.5"
}, },
"funding": [ "funding": [
{ {
@@ -1254,7 +1254,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-10-05T13:56:00+00:00" "time": "2022-03-20T21:51:18+00:00"
}, },
{ {
"name": "helhum/config-loader", "name": "helhum/config-loader",
@@ -1969,16 +1969,16 @@
}, },
{ {
"name": "phpdocumentor/type-resolver", "name": "phpdocumentor/type-resolver",
"version": "1.6.0", "version": "1.6.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git", "url": "https://github.com/phpDocumentor/TypeResolver.git",
"reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706" "reference": "77a32518733312af16a44300404e945338981de3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706", "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3",
"reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706", "reference": "77a32518733312af16a44300404e945338981de3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -2013,9 +2013,9 @@
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
"support": { "support": {
"issues": "https://github.com/phpDocumentor/TypeResolver/issues", "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
"source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.0" "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1"
}, },
"time": "2022-01-04T19:58:01+00:00" "time": "2022-03-15T21:29:03+00:00"
}, },
{ {
"name": "psr/cache", "name": "psr/cache",
public/typo3conf/ext/ep_products/Classes/Service/ContingentDataService.php
+1 -1
View File
@@ -108,7 +108,7 @@ class ContingentDataService
$row['servicesIncluded'] = unserialize($row['servicesIncluded'], ['allowed_classes' => false]); $row['servicesIncluded'] = unserialize($row['servicesIncluded'], ['allowed_classes' => false]);
$row['servicesOptional'] = unserialize($row['servicesOptional'], ['allowed_classes' => false]); $row['servicesOptional'] = unserialize($row['servicesOptional'], ['allowed_classes' => false]);
$row['priceForSelection'] = $row['price'] + ($nights - $row['minNights']) * $row['additionalNightPrice']; $row['priceForSelection'] = $row['price'] * $row['minNights'] + ($nights - $row['minNights']) * $row['additionalNightPrice'];
$rooms[] = $row; $rooms[] = $row;
} }
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/App.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<div id="myep" class="relative mb-16"> <div id="myep" class="relative mb-16">
<nav class="w-full bg-gray-50 flex items-center justify-between mb-8 relative" v-if="isLoggedIn"> <nav class="w-full bg-gray-50 flex items-center justify-between mb-8 relative" v-if="isLoggedIn">
<span class="block text-2xl px-4">My E&P</span> <span class="block text-2xl px-4">My E&P</span>
<div class="absolute z-10 top-100 left-0 w-full bg-gray-50 shadow lg:relative lg:top-auto lg:left-auto lg:w-auto lg:shadow-none lg:flex lg:space-x-4" <div class="absolute z-50 top-100 left-0 w-full bg-gray-50 shadow lg:relative lg:top-auto lg:left-auto lg:w-auto lg:shadow-none lg:flex lg:space-x-4"
:class="{ 'hidden': !navVisible }"> :class="{ 'hidden': !navVisible }">
<div class="lg:flex lg:items-center m-0"> <div class="lg:flex lg:items-center m-0">
<router-link @click.native="navVisible = false" :to="{ name: 'address' }" class="block p-4 text-black hover:bg-gray-400 hover:text-gray-800" active-class="bg-gray-400 text-gray-800">Adressdaten</router-link> <router-link @click.native="navVisible = false" :to="{ name: 'address' }" class="block p-4 text-black hover:bg-gray-400 hover:text-gray-800" active-class="bg-gray-400 text-gray-800">Adressdaten</router-link>
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/AccommodationSelect.vue
+1 -1
View File
@@ -10,7 +10,7 @@
<use href="#icon-chevron-down"></use> <use href="#icon-chevron-down"></use>
</svg> </svg>
</button> </button>
<ul class="absolute top-100 left-0 z-10 mt-4 border shadow-md p-4 bg-white w-screen max-w-xs divide-y" v-show="visible"> <ul class="absolute top-100 left-0 z-50 mt-4 border shadow-md p-4 bg-white w-screen max-w-xs divide-y" v-show="visible">
<li v-for="accommodation in selectableAccommodations" :key="accommodation.id" class="py-1"> <li v-for="accommodation in selectableAccommodations" :key="accommodation.id" class="py-1">
<a href="#" @click.prevent="selectAccommodation(accommodation)"> <a href="#" @click.prevent="selectAccommodation(accommodation)">
{{ accommodation.name}} {{ accommodation.name}}
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/ParticipantAddressForm.vue
+1 -1
View File
@@ -10,7 +10,7 @@
<use href="#icon-chevron-down"></use> <use href="#icon-chevron-down"></use>
</svg> </svg>
</button> </button>
<div class="absolute top-100 left-0 z-10 mt-4 border shadow-md p-4 bg-white w-screen max-w-xs space-y-2" v-show="visible"> <div class="absolute top-100 left-0 z-50 mt-4 border shadow-md p-4 bg-white w-screen max-w-xs space-y-2" v-show="visible">
<input class="border-gray-400 focus:border-gray-800 ring-0 focus:ring-0 mt-1 w-full" type="text" placeholder="Mobil" <input class="border-gray-400 focus:border-gray-800 ring-0 focus:ring-0 mt-1 w-full" type="text" placeholder="Mobil"
v-model="participant.data.phoneMobile" :disabled="!mutable" v-model="participant.data.phoneMobile" :disabled="!mutable"
@change="$emit('updated', participant)" @change="$emit('updated', participant)"
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/ParticipantSizesForm.vue
+1 -1
View File
@@ -8,7 +8,7 @@
<use href="#icon-chevron-down"></use> <use href="#icon-chevron-down"></use>
</svg> </svg>
</button> </button>
<div class="absolute top-100 left-0 z-10 mt-4 border shadow-md p-4 bg-white w-screen max-w-xs space-y-2" v-show="visible"> <div class="absolute top-100 left-0 z-50 mt-4 border shadow-md p-4 bg-white w-screen max-w-xs space-y-2" v-show="visible">
<input class="form-input w-full" type="text" placeholder="Körpergröße" <input class="form-input w-full" type="text" placeholder="Körpergröße"
v-model="participant.data.height" :disabled="!mutable" v-model="participant.data.height" :disabled="!mutable"
@change="$emit('updated', participant)" @change="$emit('updated', participant)"
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/PickupSelect.vue
+1 -1
View File
@@ -8,7 +8,7 @@
<use href="#icon-chevron-down"></use> <use href="#icon-chevron-down"></use>
</svg> </svg>
</button> </button>
<div class="absolute top-100 left-0 z-10 mt-4 border shadow-md p-4 bg-white w-screen max-w-xs" v-show="visible"> <div class="absolute top-100 left-0 z-50 mt-4 border shadow-md p-4 bg-white w-screen max-w-xs" v-show="visible">
<div class="py-1" v-for="pickup in pickups" :key="pickup.id"> <div class="py-1" v-for="pickup in pickups" :key="pickup.id">
<label class="inline-flex items-center text-sm"> <label class="inline-flex items-center text-sm">
<input type="radio" <input type="radio"
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/ServiceSelect.vue
+1 -1
View File
@@ -8,7 +8,7 @@
<use href="#icon-chevron-down"></use> <use href="#icon-chevron-down"></use>
</svg> </svg>
</button> </button>
<div class="absolute top-100 left-0 z-10 mt-4 border shadow-md p-4 bg-white w-screen max-w-xs" v-show="visible"> <div class="absolute top-100 left-0 z-50 mt-4 border shadow-md p-4 bg-white w-screen max-w-xs" v-show="visible">
<div class="py-1" v-for="service in availableServices" :key="service.id"> <div class="py-1" v-for="service in availableServices" :key="service.id">
<label class="inline-flex items-center text-sm"> <label class="inline-flex items-center text-sm">
<input type="checkbox" <input type="checkbox"