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

Merge branch 'develop'

Browse Source
This commit is contained in:
Björn Fromme
2022-11-29 16:22:18 +01:00
parent 72454c7881 2fb8e0f036
commit 9562b21169
3 changed files with 351 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+54 -54
View File
@@ -1849,16 +1849,16 @@
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
"version": "v4.15.1", "version": "v4.15.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nikic/PHP-Parser.git", "url": "https://github.com/nikic/PHP-Parser.git",
"reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900" "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900", "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
"reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900", "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1899,9 +1899,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/nikic/PHP-Parser/issues", "issues": "https://github.com/nikic/PHP-Parser/issues",
"source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1" "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2"
}, },
"time": "2022-09-04T07:30:47+00:00" "time": "2022-11-12T15:38:23+00:00"
}, },
{ {
"name": "phpdocumentor/reflection-common", "name": "phpdocumentor/reflection-common",
@@ -3039,16 +3039,16 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v5.4.15", "version": "v5.4.16",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
"reference": "ea59bb0edfaf9f28d18d8791410ee0355f317669" "reference": "8e9b9c8dfb33af6057c94e1b44846bee700dc5ef"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/ea59bb0edfaf9f28d18d8791410ee0355f317669", "url": "https://api.github.com/repos/symfony/console/zipball/8e9b9c8dfb33af6057c94e1b44846bee700dc5ef",
"reference": "ea59bb0edfaf9f28d18d8791410ee0355f317669", "reference": "8e9b9c8dfb33af6057c94e1b44846bee700dc5ef",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -3118,7 +3118,7 @@
"terminal" "terminal"
], ],
"support": { "support": {
"source": "https://github.com/symfony/console/tree/v5.4.15" "source": "https://github.com/symfony/console/tree/v5.4.16"
}, },
"funding": [ "funding": [
{ {
@@ -3134,20 +3134,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-10-26T21:41:52+00:00" "time": "2022-11-25T14:09:27+00:00"
}, },
{ {
"name": "symfony/dependency-injection", "name": "symfony/dependency-injection",
"version": "v5.4.13", "version": "v5.4.16",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/dependency-injection.git", "url": "https://github.com/symfony/dependency-injection.git",
"reference": "24cf522668845391c0542bc1de496366072a6d0e" "reference": "a93e1863500940780fc1235f52d54397be2d14b3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/24cf522668845391c0542bc1de496366072a6d0e", "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/a93e1863500940780fc1235f52d54397be2d14b3",
"reference": "24cf522668845391c0542bc1de496366072a6d0e", "reference": "a93e1863500940780fc1235f52d54397be2d14b3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -3207,7 +3207,7 @@
"description": "Allows you to standardize and centralize the way objects are constructed in your application", "description": "Allows you to standardize and centralize the way objects are constructed in your application",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/dependency-injection/tree/v5.4.13" "source": "https://github.com/symfony/dependency-injection/tree/v5.4.16"
}, },
"funding": [ "funding": [
{ {
@@ -3223,7 +3223,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-08-30T19:10:13+00:00" "time": "2022-11-25T07:33:13+00:00"
}, },
{ {
"name": "symfony/deprecation-contracts", "name": "symfony/deprecation-contracts",
@@ -3648,16 +3648,16 @@
}, },
{ {
"name": "symfony/http-client", "name": "symfony/http-client",
"version": "v4.4.47", "version": "v4.4.49",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-client.git", "url": "https://github.com/symfony/http-client.git",
"reference": "a3cc0a6e73a40f8ea3424a4ab528209fc4f3c272" "reference": "0185497cd61440bdf68df7d81241b97a543e9c3f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-client/zipball/a3cc0a6e73a40f8ea3424a4ab528209fc4f3c272", "url": "https://api.github.com/repos/symfony/http-client/zipball/0185497cd61440bdf68df7d81241b97a543e9c3f",
"reference": "a3cc0a6e73a40f8ea3424a4ab528209fc4f3c272", "reference": "0185497cd61440bdf68df7d81241b97a543e9c3f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -3709,7 +3709,7 @@
"description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously", "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/http-client/tree/v4.4.47" "source": "https://github.com/symfony/http-client/tree/v4.4.49"
}, },
"funding": [ "funding": [
{ {
@@ -3725,7 +3725,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-10-07T09:30:05+00:00" "time": "2022-11-03T19:03:45+00:00"
}, },
{ {
"name": "symfony/http-client-contracts", "name": "symfony/http-client-contracts",
@@ -3807,16 +3807,16 @@
}, },
{ {
"name": "symfony/http-foundation", "name": "symfony/http-foundation",
"version": "v5.4.15", "version": "v5.4.16",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-foundation.git", "url": "https://github.com/symfony/http-foundation.git",
"reference": "75bd663ff2db90141bfb733682459d5bbe9e29c3" "reference": "5032c5849aef24741e1970cb03511b0dd131d838"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/75bd663ff2db90141bfb733682459d5bbe9e29c3", "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5032c5849aef24741e1970cb03511b0dd131d838",
"reference": "75bd663ff2db90141bfb733682459d5bbe9e29c3", "reference": "5032c5849aef24741e1970cb03511b0dd131d838",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -3863,7 +3863,7 @@
"description": "Defines an object-oriented layer for the HTTP specification", "description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/http-foundation/tree/v5.4.15" "source": "https://github.com/symfony/http-foundation/tree/v5.4.16"
}, },
"funding": [ "funding": [
{ {
@@ -3879,7 +3879,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-10-12T09:43:19+00:00" "time": "2022-11-07T08:06:40+00:00"
}, },
{ {
"name": "symfony/inflector", "name": "symfony/inflector",
@@ -3956,16 +3956,16 @@
}, },
{ {
"name": "symfony/mailer", "name": "symfony/mailer",
"version": "v5.4.15", "version": "v5.4.16",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/mailer.git", "url": "https://github.com/symfony/mailer.git",
"reference": "926f4deddb60d40024e6058fd8f94e70e4024930" "reference": "501ac1c388b18390547aa138253de2c5e44e931e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/mailer/zipball/926f4deddb60d40024e6058fd8f94e70e4024930", "url": "https://api.github.com/repos/symfony/mailer/zipball/501ac1c388b18390547aa138253de2c5e44e931e",
"reference": "926f4deddb60d40024e6058fd8f94e70e4024930", "reference": "501ac1c388b18390547aa138253de2c5e44e931e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -4012,7 +4012,7 @@
"description": "Helps sending emails", "description": "Helps sending emails",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/mailer/tree/v5.4.15" "source": "https://github.com/symfony/mailer/tree/v5.4.16"
}, },
"funding": [ "funding": [
{ {
@@ -4028,7 +4028,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-10-27T07:55:40+00:00" "time": "2022-11-04T07:37:26+00:00"
}, },
{ {
"name": "symfony/mime", "name": "symfony/mime",
@@ -5145,16 +5145,16 @@
}, },
{ {
"name": "symfony/property-info", "name": "symfony/property-info",
"version": "v5.4.15", "version": "v5.4.16",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/property-info.git", "url": "https://github.com/symfony/property-info.git",
"reference": "3ef5e026a71a39345da241292c153979893033c2" "reference": "9dd148c4fbfc231fa4bff00def8dc16a2cd89944"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/property-info/zipball/3ef5e026a71a39345da241292c153979893033c2", "url": "https://api.github.com/repos/symfony/property-info/zipball/9dd148c4fbfc231fa4bff00def8dc16a2cd89944",
"reference": "3ef5e026a71a39345da241292c153979893033c2", "reference": "9dd148c4fbfc231fa4bff00def8dc16a2cd89944",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -5216,7 +5216,7 @@
"validator" "validator"
], ],
"support": { "support": {
"source": "https://github.com/symfony/property-info/tree/v5.4.15" "source": "https://github.com/symfony/property-info/tree/v5.4.16"
}, },
"funding": [ "funding": [
{ {
@@ -5232,7 +5232,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-10-27T07:55:40+00:00" "time": "2022-11-19T17:41:50+00:00"
}, },
{ {
"name": "symfony/routing", "name": "symfony/routing",
@@ -5840,16 +5840,16 @@
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
"version": "v5.4.14", "version": "v5.4.16",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/yaml.git", "url": "https://github.com/symfony/yaml.git",
"reference": "e83fe9a72011f07c662da46a05603d66deeeb487" "reference": "ebd37c71f62d5ec5f6e27de3e06fee492d4c6298"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/e83fe9a72011f07c662da46a05603d66deeeb487", "url": "https://api.github.com/repos/symfony/yaml/zipball/ebd37c71f62d5ec5f6e27de3e06fee492d4c6298",
"reference": "e83fe9a72011f07c662da46a05603d66deeeb487", "reference": "ebd37c71f62d5ec5f6e27de3e06fee492d4c6298",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -5895,7 +5895,7 @@
"description": "Loads and dumps YAML files", "description": "Loads and dumps YAML files",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/yaml/tree/v5.4.14" "source": "https://github.com/symfony/yaml/tree/v5.4.16"
}, },
"funding": [ "funding": [
{ {
@@ -5911,7 +5911,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-10-03T15:15:50+00:00" "time": "2022-11-25T16:04:03+00:00"
}, },
{ {
"name": "tritum/form-element-linked-checkbox", "name": "tritum/form-element-linked-checkbox",
@@ -8660,16 +8660,16 @@
}, },
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",
"version": "9.2.18", "version": "9.2.19",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a" "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/12fddc491826940cf9b7e88ad9664cf51f0f6d0a", "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c77b56b63e3d2031bd8997fcec43c1925ae46559",
"reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a", "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -8725,7 +8725,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
"source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.18" "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.19"
}, },
"funding": [ "funding": [
{ {
@@ -8733,7 +8733,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2022-10-27T13:35:33+00:00" "time": "2022-11-18T07:47:47+00:00"
}, },
{ {
"name": "phpunit/php-file-iterator", "name": "phpunit/php-file-iterator",
package-lock.json
Generated
+294 -294
View File
File diff suppressed because it is too large Load Diff
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/GroupsPriceCalculator.vue
+3 -3
View File
@@ -482,9 +482,9 @@ export default {
return price; return price;
}, },
priceRunningCosts() { priceRunningCosts() {
if (this.selectedBoard) { // if (this.selectedBoard) {
return 0; // return 0;
} // }
return this.nightsCount * this.totalPax * this.runningCostsFactor; return this.nightsCount * this.totalPax * this.runningCostsFactor;
}, },
priceTotal() { priceTotal() {