diff --git a/composer.lock b/composer.lock index 70f5f0c9..520ca868 100644 --- a/composer.lock +++ b/composer.lock @@ -4828,26 +4828,26 @@ }, { "name": "typo3/cms-adminpanel", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/adminpanel.git", - "reference": "44c9e53a0cc3d4e9a0f829024d490670576a78fc" + "reference": "c31659ce447093a3057f09d9a911f64b4f7e038c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/adminpanel/zipball/44c9e53a0cc3d4e9a0f829024d490670576a78fc", - "reference": "44c9e53a0cc3d4e9a0f829024d490670576a78fc", + "url": "https://api.github.com/repos/TYPO3-CMS/adminpanel/zipball/c31659ce447093a3057f09d9a911f64b4f7e038c", + "reference": "c31659ce447093a3057f09d9a911f64b4f7e038c", "shasum": "" }, "require": { "psr/http-message": "^1.0", "psr/http-server-handler": "^1.0", "psr/http-server-middleware": "^1.0", - "typo3/cms-backend": "9.5.29", - "typo3/cms-core": "9.5.29", - "typo3/cms-fluid": "9.5.29", - "typo3/cms-frontend": "9.5.29", + "typo3/cms-backend": "9.5.30", + "typo3/cms-core": "9.5.30", + "typo3/cms-fluid": "9.5.30", + "typo3/cms-frontend": "9.5.30", "typo3fluid/fluid": "^2.6.10" }, "conflict": { @@ -4887,27 +4887,27 @@ "description": "The TYPO3 admin panel provides a panel with additional functionality in the frontend (Debugging, Caching, Preview...)", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/adminpanel/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/adminpanel/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-backend", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/backend.git", - "reference": "5726d6cdb32f0ecdbc228dc0496a9cd21e23c59d" + "reference": "e5f353ee7fff5b622f3aa39f5e63f5af967d71bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/backend/zipball/5726d6cdb32f0ecdbc228dc0496a9cd21e23c59d", - "reference": "5726d6cdb32f0ecdbc228dc0496a9cd21e23c59d", + "url": "https://api.github.com/repos/TYPO3-CMS/backend/zipball/e5f353ee7fff5b622f3aa39f5e63f5af967d71bc", + "reference": "e5f353ee7fff5b622f3aa39f5e63f5af967d71bc", "shasum": "" }, "require": { - "typo3/cms-core": "9.5.29", - "typo3/cms-recordlist": "9.5.29" + "typo3/cms-core": "9.5.30", + "typo3/cms-recordlist": "9.5.30" }, "conflict": { "typo3/cms": "*" @@ -4957,26 +4957,26 @@ "description": "Classes for the TYPO3 backend.", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/backend/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/backend/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-belog", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/belog.git", - "reference": "a58c7c33f92cd72bb7db0c1500de71f7e7a5e413" + "reference": "dd09b4cb9eb15cc99ec8dcd614e0dac132ecbe6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/belog/zipball/a58c7c33f92cd72bb7db0c1500de71f7e7a5e413", - "reference": "a58c7c33f92cd72bb7db0c1500de71f7e7a5e413", + "url": "https://api.github.com/repos/TYPO3-CMS/belog/zipball/dd09b4cb9eb15cc99ec8dcd614e0dac132ecbe6a", + "reference": "dd09b4cb9eb15cc99ec8dcd614e0dac132ecbe6a", "shasum": "" }, "require": { - "typo3/cms-core": "9.5.29" + "typo3/cms-core": "9.5.30" }, "conflict": { "typo3/cms": "*" @@ -5009,26 +5009,26 @@ "description": "Displays backend log, both per page and system wide. Available as the module Tools>Log (system wide overview) and Web>Info/Log (page relative overview).", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/belog/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/belog/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-beuser", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/beuser.git", - "reference": "85df5e31b2349281c4a87e5d2fd739a05230d691" + "reference": "2e1990e2dfc47119cfc317ba3bb9a860a9fd9220" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/beuser/zipball/85df5e31b2349281c4a87e5d2fd739a05230d691", - "reference": "85df5e31b2349281c4a87e5d2fd739a05230d691", + "url": "https://api.github.com/repos/TYPO3-CMS/beuser/zipball/2e1990e2dfc47119cfc317ba3bb9a860a9fd9220", + "reference": "2e1990e2dfc47119cfc317ba3bb9a860a9fd9220", "shasum": "" }, "require": { - "typo3/cms-core": "9.5.29" + "typo3/cms-core": "9.5.30" }, "conflict": { "typo3/cms": "*" @@ -5061,9 +5061,9 @@ "description": "Backend user administration and overview. Allows you to compare the settings of users and verify their permissions and see who is online.", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/beuser/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/beuser/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-cli", @@ -5175,16 +5175,16 @@ }, { "name": "typo3/cms-core", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/core.git", - "reference": "5489bf7240f10921fe891dbc252a485d6be3f2ce" + "reference": "7a65ceb9d9aac6ae847693d1273672e77e61a280" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/core/zipball/5489bf7240f10921fe891dbc252a485d6be3f2ce", - "reference": "5489bf7240f10921fe891dbc252a485d6be3f2ce", + "url": "https://api.github.com/repos/TYPO3-CMS/core/zipball/7a65ceb9d9aac6ae847693d1273672e77e61a280", + "reference": "7a65ceb9d9aac6ae847693d1273672e77e61a280", "shasum": "" }, "require": { @@ -5221,7 +5221,7 @@ "typo3/class-alias-loader": "^1.0", "typo3/cms-cli": "^2.0", "typo3/cms-composer-installers": "^2.0 || ^3.0", - "typo3/html-sanitizer": "^2.0.7", + "typo3/html-sanitizer": "^2.0.9", "typo3/phar-stream-wrapper": "^3.1.6", "typo3fluid/fluid": "^2.6.10" }, @@ -5234,7 +5234,6 @@ "typo3fluid/fluid": "2.6.4 || 2.6.5" }, "replace": { - "t3g/svg-sanitizer": "*", "typo3/cms-lang": "*", "typo3/cms-saltedpasswords": "*", "typo3/cms-sv": "*" @@ -5296,26 +5295,26 @@ "description": "The core library of TYPO3.", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/core/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/core/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-extbase", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/extbase.git", - "reference": "94f4c85b231f741b8700d56afe5c89f1023d5a16" + "reference": "10f008b8e868e393674bb5effdeb1d495cae49d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/extbase/zipball/94f4c85b231f741b8700d56afe5c89f1023d5a16", - "reference": "94f4c85b231f741b8700d56afe5c89f1023d5a16", + "url": "https://api.github.com/repos/TYPO3-CMS/extbase/zipball/10f008b8e868e393674bb5effdeb1d495cae49d4", + "reference": "10f008b8e868e393674bb5effdeb1d495cae49d4", "shasum": "" }, "require": { - "typo3/cms-core": "9.5.29" + "typo3/cms-core": "9.5.30" }, "conflict": { "typo3/cms": "*" @@ -5358,26 +5357,26 @@ "description": "A framework to build extensions for TYPO3 CMS.", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/extbase/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/extbase/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-extensionmanager", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/extensionmanager.git", - "reference": "67162912947f364fee89920bd8bc4c782601d923" + "reference": "abe766b92c62cb3c3cfcaed039d732cdd94643ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/extensionmanager/zipball/67162912947f364fee89920bd8bc4c782601d923", - "reference": "67162912947f364fee89920bd8bc4c782601d923", + "url": "https://api.github.com/repos/TYPO3-CMS/extensionmanager/zipball/abe766b92c62cb3c3cfcaed039d732cdd94643ac", + "reference": "abe766b92c62cb3c3cfcaed039d732cdd94643ac", "shasum": "" }, "require": { - "typo3/cms-core": "9.5.29" + "typo3/cms-core": "9.5.30" }, "conflict": { "typo3/cms": "*" @@ -5412,26 +5411,26 @@ "description": "TYPO3 Extension Manager", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/extensionmanager/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/extensionmanager/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-felogin", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/felogin.git", - "reference": "c82e9d88cc82d87ccb70720ede1c5450ff1971e1" + "reference": "bd52f0064c11136799290709cbccbb6c8d0e0c48" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/felogin/zipball/c82e9d88cc82d87ccb70720ede1c5450ff1971e1", - "reference": "c82e9d88cc82d87ccb70720ede1c5450ff1971e1", + "url": "https://api.github.com/repos/TYPO3-CMS/felogin/zipball/bd52f0064c11136799290709cbccbb6c8d0e0c48", + "reference": "bd52f0064c11136799290709cbccbb6c8d0e0c48", "shasum": "" }, "require": { - "typo3/cms-core": "9.5.29" + "typo3/cms-core": "9.5.30" }, "conflict": { "typo3/cms": "*" @@ -5464,26 +5463,26 @@ "description": "A template-based plugin to log in Website Users in the Frontend", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/felogin/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/felogin/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-filelist", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/filelist.git", - "reference": "1c12b60684d12bcfb4596e2440fedb82e504c5c4" + "reference": "3e37ab9075968e4e58260654145d937b2f291d78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/filelist/zipball/1c12b60684d12bcfb4596e2440fedb82e504c5c4", - "reference": "1c12b60684d12bcfb4596e2440fedb82e504c5c4", + "url": "https://api.github.com/repos/TYPO3-CMS/filelist/zipball/3e37ab9075968e4e58260654145d937b2f291d78", + "reference": "3e37ab9075968e4e58260654145d937b2f291d78", "shasum": "" }, "require": { - "typo3/cms-core": "9.5.29" + "typo3/cms-core": "9.5.30" }, "conflict": { "typo3/cms": "*" @@ -5518,26 +5517,26 @@ "description": "Listing of files in the directory", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/filelist/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/filelist/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-filemetadata", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/filemetadata.git", - "reference": "b41bb5f43a8403e48cba411dadf6714dbbd4b805" + "reference": "20cd4e1b1a1518bb0c09616523960ce763124978" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/filemetadata/zipball/b41bb5f43a8403e48cba411dadf6714dbbd4b805", - "reference": "b41bb5f43a8403e48cba411dadf6714dbbd4b805", + "url": "https://api.github.com/repos/TYPO3-CMS/filemetadata/zipball/20cd4e1b1a1518bb0c09616523960ce763124978", + "reference": "20cd4e1b1a1518bb0c09616523960ce763124978", "shasum": "" }, "require": { - "typo3/cms-core": "9.5.29" + "typo3/cms-core": "9.5.30" }, "conflict": { "typo3/cms": "*" @@ -5562,27 +5561,27 @@ "description": "Add advanced metadata to File.", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/filemetadata/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/filemetadata/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-fluid", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/fluid.git", - "reference": "4c0fcc9f1e1ec99e9d02183432dfabb7099d62af" + "reference": "b2869b0b8e2453007c145db12701a5276acceaf1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/fluid/zipball/4c0fcc9f1e1ec99e9d02183432dfabb7099d62af", - "reference": "4c0fcc9f1e1ec99e9d02183432dfabb7099d62af", + "url": "https://api.github.com/repos/TYPO3-CMS/fluid/zipball/b2869b0b8e2453007c145db12701a5276acceaf1", + "reference": "b2869b0b8e2453007c145db12701a5276acceaf1", "shasum": "" }, "require": { - "typo3/cms-core": "9.5.29", - "typo3/cms-extbase": "9.5.29", + "typo3/cms-core": "9.5.30", + "typo3/cms-extbase": "9.5.30", "typo3fluid/fluid": "^2.6.10" }, "conflict": { @@ -5624,28 +5623,28 @@ "description": "Fluid is a next-generation templating engine which makes the life of extension authors a lot easier!", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/fluid/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/fluid/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-fluid-styled-content", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/fluid_styled_content.git", - "reference": "29862adda1e33ad613b751472b2a2e6d62730e94" + "reference": "14f030b44c715b04562b91b083a5c74098ed669f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/fluid_styled_content/zipball/29862adda1e33ad613b751472b2a2e6d62730e94", - "reference": "29862adda1e33ad613b751472b2a2e6d62730e94", + "url": "https://api.github.com/repos/TYPO3-CMS/fluid_styled_content/zipball/14f030b44c715b04562b91b083a5c74098ed669f", + "reference": "14f030b44c715b04562b91b083a5c74098ed669f", "shasum": "" }, "require": { - "typo3/cms-core": "9.5.29", - "typo3/cms-fluid": "9.5.29", - "typo3/cms-frontend": "9.5.29" + "typo3/cms-core": "9.5.30", + "typo3/cms-fluid": "9.5.30", + "typo3/cms-frontend": "9.5.30" }, "conflict": { "typo3/cms": "*" @@ -5678,28 +5677,28 @@ "description": "A set of common content elements based on Fluid for Frontend output.", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/fluid_styled_content/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/fluid_styled_content/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-form", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/form.git", - "reference": "2a6c55d17246d3c99292cde0bf17a4fb2adb0d2f" + "reference": "552053000744229651fae741f1df8580fcb41f12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/form/zipball/2a6c55d17246d3c99292cde0bf17a4fb2adb0d2f", - "reference": "2a6c55d17246d3c99292cde0bf17a4fb2adb0d2f", + "url": "https://api.github.com/repos/TYPO3-CMS/form/zipball/552053000744229651fae741f1df8580fcb41f12", + "reference": "552053000744229651fae741f1df8580fcb41f12", "shasum": "" }, "require": { "psr/http-message": "^1.0", "symfony/expression-language": "^4.1", - "typo3/cms-core": "9.5.29" + "typo3/cms-core": "9.5.30" }, "conflict": { "typo3/cms": "*" @@ -5736,26 +5735,26 @@ "description": "Form Library, Plugin and Editor", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/form/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/form/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-frontend", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/frontend.git", - "reference": "2064d5276b21216a8047c831984b3ed33df038b3" + "reference": "780660e629cd3ea4e156928fe8f65d2d84904f3d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/frontend/zipball/2064d5276b21216a8047c831984b3ed33df038b3", - "reference": "2064d5276b21216a8047c831984b3ed33df038b3", + "url": "https://api.github.com/repos/TYPO3-CMS/frontend/zipball/780660e629cd3ea4e156928fe8f65d2d84904f3d", + "reference": "780660e629cd3ea4e156928fe8f65d2d84904f3d", "shasum": "" }, "require": { - "typo3/cms-core": "9.5.29" + "typo3/cms-core": "9.5.30" }, "conflict": { "typo3/cms": "*" @@ -5793,26 +5792,26 @@ "description": "Classes for the frontend of TYPO3.", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/frontend/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/frontend/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-info", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/info.git", - "reference": "fc8c5c86a029222596671903eede6565693c85fb" + "reference": "51f3a41dc2595872e135114a456c11a57cb60966" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/info/zipball/fc8c5c86a029222596671903eede6565693c85fb", - "reference": "fc8c5c86a029222596671903eede6565693c85fb", + "url": "https://api.github.com/repos/TYPO3-CMS/info/zipball/51f3a41dc2595872e135114a456c11a57cb60966", + "reference": "51f3a41dc2595872e135114a456c11a57cb60966", "shasum": "" }, "require": { - "typo3/cms-core": "9.5.29" + "typo3/cms-core": "9.5.30" }, "conflict": { "typo3/cms": "*" @@ -5854,30 +5853,30 @@ "description": "Shows various infos", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/info/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/info/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-install", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/install.git", - "reference": "b1bfcb9a607363456e8dab587a7adc867b165ca7" + "reference": "67338d910a9debcabf076eeff32496a66cc94053" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/install/zipball/b1bfcb9a607363456e8dab587a7adc867b165ca7", - "reference": "b1bfcb9a607363456e8dab587a7adc867b165ca7", + "url": "https://api.github.com/repos/TYPO3-CMS/install/zipball/67338d910a9debcabf076eeff32496a66cc94053", + "reference": "67338d910a9debcabf076eeff32496a66cc94053", "shasum": "" }, "require": { "nikic/php-parser": "^4.3.0", "symfony/finder": "^4.1", - "typo3/cms-core": "9.5.29", - "typo3/cms-extbase": "9.5.29", - "typo3/cms-fluid": "9.5.29" + "typo3/cms-core": "9.5.30", + "typo3/cms-extbase": "9.5.30", + "typo3/cms-fluid": "9.5.30" }, "conflict": { "typo3/cms": "*" @@ -5912,26 +5911,26 @@ "description": "The Install Tool mounted as the module Tools>Install in TYPO3.", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/install/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/install/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-lowlevel", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/lowlevel.git", - "reference": "e683a9d5f5ae6d5f4114cc33a686e716e53b43a1" + "reference": "9cb947f0109c52303c6848f27d9b93a06b92dc78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/lowlevel/zipball/e683a9d5f5ae6d5f4114cc33a686e716e53b43a1", - "reference": "e683a9d5f5ae6d5f4114cc33a686e716e53b43a1", + "url": "https://api.github.com/repos/TYPO3-CMS/lowlevel/zipball/9cb947f0109c52303c6848f27d9b93a06b92dc78", + "reference": "9cb947f0109c52303c6848f27d9b93a06b92dc78", "shasum": "" }, "require": { - "typo3/cms-core": "9.5.29" + "typo3/cms-core": "9.5.30" }, "conflict": { "typo3/cms": "*" @@ -5969,26 +5968,26 @@ "description": "Enables the 'Config' and 'DB Check' modules for technical analysis of the system. This includes raw database search, checking relations, counting pages and records etc.", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/lowlevel/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/lowlevel/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-recordlist", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/recordlist.git", - "reference": "ed166532f7aadf1088aea6132260b6297810ac0d" + "reference": "d096519417e1e73a73a671b29aeadca8589dc666" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/recordlist/zipball/ed166532f7aadf1088aea6132260b6297810ac0d", - "reference": "ed166532f7aadf1088aea6132260b6297810ac0d", + "url": "https://api.github.com/repos/TYPO3-CMS/recordlist/zipball/d096519417e1e73a73a671b29aeadca8589dc666", + "reference": "d096519417e1e73a73a671b29aeadca8589dc666", "shasum": "" }, "require": { - "typo3/cms-core": "9.5.29" + "typo3/cms-core": "9.5.30" }, "conflict": { "typo3/cms": "*" @@ -6028,26 +6027,26 @@ "description": "List of database-records", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/recordlist/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/recordlist/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-recycler", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/recycler.git", - "reference": "2fa0a783ef70db82c8768d6371b95dbee2de070c" + "reference": "0c8b62d8601d6c83d0b387f939da852bc2075df5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/recycler/zipball/2fa0a783ef70db82c8768d6371b95dbee2de070c", - "reference": "2fa0a783ef70db82c8768d6371b95dbee2de070c", + "url": "https://api.github.com/repos/TYPO3-CMS/recycler/zipball/0c8b62d8601d6c83d0b387f939da852bc2075df5", + "reference": "0c8b62d8601d6c83d0b387f939da852bc2075df5", "shasum": "" }, "require": { - "typo3/cms-core": "9.5.29" + "typo3/cms-core": "9.5.30" }, "conflict": { "typo3/cms": "*" @@ -6080,27 +6079,27 @@ "description": "The recycler offers the possibility to restore deleted records or remove them from the database permanently. These actions can be applied to a single record, multiple records, and recursively to child records (ex. restoring a page can restore all content elements on that page). Filtering by page and by table provides a quick overview of deleted records before taking action on them.", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/recycler/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/recycler/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-redirects", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/redirects.git", - "reference": "35973579d83bfb7754a50dbbd9ad6c8c3238c7ff" + "reference": "3f020b9772a1618dbe44894dbe6f8d9539a9594d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/redirects/zipball/35973579d83bfb7754a50dbbd9ad6c8c3238c7ff", - "reference": "35973579d83bfb7754a50dbbd9ad6c8c3238c7ff", + "url": "https://api.github.com/repos/TYPO3-CMS/redirects/zipball/3f020b9772a1618dbe44894dbe6f8d9539a9594d", + "reference": "3f020b9772a1618dbe44894dbe6f8d9539a9594d", "shasum": "" }, "require": { - "typo3/cms-backend": "9.5.29", - "typo3/cms-core": "9.5.29", + "typo3/cms-backend": "9.5.30", + "typo3/cms-core": "9.5.30", "typo3fluid/fluid": "^2.6.10" }, "conflict": { @@ -6135,26 +6134,26 @@ "description": "Custom redirects in TYPO3.", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/redirects/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/redirects/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-reports", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/reports.git", - "reference": "8d86f7afb2368cdb5940a701c7832e5d85e01c3e" + "reference": "0cb3877fa89eb6debcaad96b75435c89953ee881" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/reports/zipball/8d86f7afb2368cdb5940a701c7832e5d85e01c3e", - "reference": "8d86f7afb2368cdb5940a701c7832e5d85e01c3e", + "url": "https://api.github.com/repos/TYPO3-CMS/reports/zipball/0cb3877fa89eb6debcaad96b75435c89953ee881", + "reference": "0cb3877fa89eb6debcaad96b75435c89953ee881", "shasum": "" }, "require": { - "typo3/cms-core": "9.5.29" + "typo3/cms-core": "9.5.30" }, "conflict": { "typo3/cms": "*" @@ -6195,26 +6194,26 @@ "description": "The reports module groups several system reports.", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/reports/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/reports/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-rte-ckeditor", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/rte_ckeditor.git", - "reference": "7a61825ea8a13f2154f3a135f7f76742d4a17d35" + "reference": "c774863c5799c76ce57bf277063edd4b33a8bbf6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/rte_ckeditor/zipball/7a61825ea8a13f2154f3a135f7f76742d4a17d35", - "reference": "7a61825ea8a13f2154f3a135f7f76742d4a17d35", + "url": "https://api.github.com/repos/TYPO3-CMS/rte_ckeditor/zipball/c774863c5799c76ce57bf277063edd4b33a8bbf6", + "reference": "c774863c5799c76ce57bf277063edd4b33a8bbf6", "shasum": "" }, "require": { - "typo3/cms-core": "9.5.29" + "typo3/cms-core": "9.5.30" }, "conflict": { "typo3/cms": "*" @@ -6250,26 +6249,26 @@ "description": "Integration of CKEditor as Rich Text Editor.", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/rte_ckeditor/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/rte_ckeditor/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-scheduler", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/scheduler.git", - "reference": "619d232e118298c73c0dc42fd83a2414ff0e88cb" + "reference": "f3438098e696d41a7f6d9811f64dbedf3d8ffa65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/scheduler/zipball/619d232e118298c73c0dc42fd83a2414ff0e88cb", - "reference": "619d232e118298c73c0dc42fd83a2414ff0e88cb", + "url": "https://api.github.com/repos/TYPO3-CMS/scheduler/zipball/f3438098e696d41a7f6d9811f64dbedf3d8ffa65", + "reference": "f3438098e696d41a7f6d9811f64dbedf3d8ffa65", "shasum": "" }, "require": { - "typo3/cms-core": "9.5.29" + "typo3/cms-core": "9.5.30" }, "conflict": { "typo3/cms": "*" @@ -6299,28 +6298,28 @@ "description": "The TYPO3 Scheduler let's you register tasks to happen at a specific time", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/scheduler/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/scheduler/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-seo", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/seo.git", - "reference": "9710a497a95719c660d0298e158b1deba3741403" + "reference": "32dffb22db51222f18a570f9bb94c8b2715b8a40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/seo/zipball/9710a497a95719c660d0298e158b1deba3741403", - "reference": "9710a497a95719c660d0298e158b1deba3741403", + "url": "https://api.github.com/repos/TYPO3-CMS/seo/zipball/32dffb22db51222f18a570f9bb94c8b2715b8a40", + "reference": "32dffb22db51222f18a570f9bb94c8b2715b8a40", "shasum": "" }, "require": { - "typo3/cms-core": "9.5.29", - "typo3/cms-extbase": "9.5.29", - "typo3/cms-frontend": "9.5.29" + "typo3/cms-core": "9.5.30", + "typo3/cms-extbase": "9.5.30", + "typo3/cms-frontend": "9.5.30" }, "conflict": { "typo3/cms": "*" @@ -6353,26 +6352,26 @@ "description": "SEO features for TYPO3.", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/seo/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/seo/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-setup", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/setup.git", - "reference": "364c56ff32b26846729a1455f70a476d7aff2426" + "reference": "daa938c1a43752018a0b7235f925438b9b6403c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/setup/zipball/364c56ff32b26846729a1455f70a476d7aff2426", - "reference": "364c56ff32b26846729a1455f70a476d7aff2426", + "url": "https://api.github.com/repos/TYPO3-CMS/setup/zipball/daa938c1a43752018a0b7235f925438b9b6403c5", + "reference": "daa938c1a43752018a0b7235f925438b9b6403c5", "shasum": "" }, "require": { - "typo3/cms-core": "9.5.29" + "typo3/cms-core": "9.5.30" }, "conflict": { "typo3/cms": "*" @@ -6405,26 +6404,26 @@ "description": "Allows users to edit a limited set of options for their user profile, eg. preferred language and their name and email address.", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/setup/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/setup/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-t3editor", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/t3editor.git", - "reference": "1c1997abe30d7d4795efeff84b0fe6e77a992c19" + "reference": "064192b31094fc99595824bd0255b131ae4a221d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/t3editor/zipball/1c1997abe30d7d4795efeff84b0fe6e77a992c19", - "reference": "1c1997abe30d7d4795efeff84b0fe6e77a992c19", + "url": "https://api.github.com/repos/TYPO3-CMS/t3editor/zipball/064192b31094fc99595824bd0255b131ae4a221d", + "reference": "064192b31094fc99595824bd0255b131ae4a221d", "shasum": "" }, "require": { - "typo3/cms-core": "9.5.29" + "typo3/cms-core": "9.5.30" }, "conflict": { "typo3/cms": "*" @@ -6462,26 +6461,26 @@ "description": "JavaScript-driven editor with syntax highlighting and codecompletion. Based on CodeMirror.", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/t3editor/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/t3editor/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-taskcenter", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/taskcenter.git", - "reference": "0961529aa3315a994b4caf3175eff4c3a271c7e2" + "reference": "9e4c798732d02406a318d9539118d2bf1aee6120" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/taskcenter/zipball/0961529aa3315a994b4caf3175eff4c3a271c7e2", - "reference": "0961529aa3315a994b4caf3175eff4c3a271c7e2", + "url": "https://api.github.com/repos/TYPO3-CMS/taskcenter/zipball/9e4c798732d02406a318d9539118d2bf1aee6120", + "reference": "9e4c798732d02406a318d9539118d2bf1aee6120", "shasum": "" }, "require": { - "typo3/cms-core": "9.5.29" + "typo3/cms-core": "9.5.30" }, "conflict": { "typo3/cms": "*" @@ -6511,26 +6510,26 @@ "description": "The Task Center is the framework for a host of other extensions, see below.", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/taskcenter/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/taskcenter/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-tstemplate", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/tstemplate.git", - "reference": "f39bd6362f4998fe8f7bd47662ea0d0a57e4c001" + "reference": "299f592a08380e2c1e439ee077043afd1eafb018" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/tstemplate/zipball/f39bd6362f4998fe8f7bd47662ea0d0a57e4c001", - "reference": "f39bd6362f4998fe8f7bd47662ea0d0a57e4c001", + "url": "https://api.github.com/repos/TYPO3-CMS/tstemplate/zipball/299f592a08380e2c1e439ee077043afd1eafb018", + "reference": "299f592a08380e2c1e439ee077043afd1eafb018", "shasum": "" }, "require": { - "typo3/cms-core": "9.5.29" + "typo3/cms-core": "9.5.30" }, "conflict": { "typo3/cms": "*" @@ -6563,26 +6562,26 @@ "description": "Framework for management of TypoScript template records for the CMS frontend.", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/tstemplate/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/tstemplate/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/cms-viewpage", - "version": "v9.5.29", + "version": "v9.5.30", "source": { "type": "git", "url": "https://github.com/TYPO3-CMS/viewpage.git", - "reference": "de46c35e3ae41772918c2faa53421cf44dc89121" + "reference": "7b778214e635885730c5cbb91e7e4515cbf97737" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3-CMS/viewpage/zipball/de46c35e3ae41772918c2faa53421cf44dc89121", - "reference": "de46c35e3ae41772918c2faa53421cf44dc89121", + "url": "https://api.github.com/repos/TYPO3-CMS/viewpage/zipball/7b778214e635885730c5cbb91e7e4515cbf97737", + "reference": "7b778214e635885730c5cbb91e7e4515cbf97737", "shasum": "" }, "require": { - "typo3/cms-core": "9.5.29" + "typo3/cms-core": "9.5.30" }, "conflict": { "typo3/cms": "*" @@ -6615,22 +6614,22 @@ "description": "Shows the frontend webpage inside the backend frameset.", "homepage": "https://typo3.org", "support": { - "source": "https://github.com/TYPO3-CMS/viewpage/tree/v9.5.29" + "source": "https://github.com/TYPO3-CMS/viewpage/tree/v9.5.30" }, - "time": "2021-08-10T08:02:29+00:00" + "time": "2021-08-16T12:12:11+00:00" }, { "name": "typo3/html-sanitizer", - "version": "v2.0.7", + "version": "v2.0.9", "source": { "type": "git", "url": "https://github.com/TYPO3/html-sanitizer.git", - "reference": "c5f1e2eb37f3b7799029ab01e145028e35b2e61a" + "reference": "5dfd055b3d62a505d6dd8381f3145d17147ceb6d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3/html-sanitizer/zipball/c5f1e2eb37f3b7799029ab01e145028e35b2e61a", - "reference": "c5f1e2eb37f3b7799029ab01e145028e35b2e61a", + "url": "https://api.github.com/repos/TYPO3/html-sanitizer/zipball/5dfd055b3d62a505d6dd8381f3145d17147ceb6d", + "reference": "5dfd055b3d62a505d6dd8381f3145d17147ceb6d", "shasum": "" }, "require": { @@ -6666,9 +6665,9 @@ "description": "HTML sanitizer aiming to provide XSS-safe markup based on explicitly allowed tags, attributes and values.", "support": { "issues": "https://github.com/TYPO3/html-sanitizer/issues", - "source": "https://github.com/TYPO3/html-sanitizer/tree/v2.0.7" + "source": "https://github.com/TYPO3/html-sanitizer/tree/v2.0.9" }, - "time": "2021-08-08T20:57:41+00:00" + "time": "2021-08-16T10:44:16+00:00" }, { "name": "typo3/phar-stream-wrapper", diff --git a/public/typo3conf/ext/ep_products/Classes/Command/ContingentCommandController.php b/public/typo3conf/ext/ep_products/Classes/Command/ContingentCommand.php similarity index 85% rename from public/typo3conf/ext/ep_products/Classes/Command/ContingentCommandController.php rename to public/typo3conf/ext/ep_products/Classes/Command/ContingentCommand.php index 6333064d..dd14d2ca 100644 --- a/public/typo3conf/ext/ep_products/Classes/Command/ContingentCommandController.php +++ b/public/typo3conf/ext/ep_products/Classes/Command/ContingentCommand.php @@ -32,8 +32,9 @@ use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use TYPO3\CMS\Core\Utility\GeneralUtility; +use TYPO3\CMS\Extbase\Object\ObjectManager; -class ContingentCommandController extends Command +class ContingentCommand extends Command { /** @@ -49,9 +50,11 @@ class ContingentCommandController extends Command /** * @param ContingentImportService $contingentImportService */ - public function __construct(ContingentImportService $contingentImportService) + public function __construct() { - $this->contingentImportService = $contingentImportService; + /** @var ObjectManager $objectManager */ + $objectManager = GeneralUtility::makeInstance(ObjectManager::class); + $this->contingentImportService = $objectManager->get(ContingentImportService::class); parent::__construct(); } diff --git a/public/typo3conf/ext/ep_products/Classes/Service/ContingentImportService.php b/public/typo3conf/ext/ep_products/Classes/Service/ContingentImportService.php index 6f16691d..6dc2b363 100644 --- a/public/typo3conf/ext/ep_products/Classes/Service/ContingentImportService.php +++ b/public/typo3conf/ext/ep_products/Classes/Service/ContingentImportService.php @@ -212,8 +212,11 @@ class ContingentImportService implements SingletonInterface, LoggerAwareInterfac $types = []; foreach ($xmlTypes->unterbringung as $xmlType) { + $idBusPro = (string) $xmlType['idbuspro']; $code = (string) $xmlType['code']; - $types[(string) $xmlType['idbuspro']] = [ + $types[] = [ + 'idBusPro' => $idBusPro, + 'link' => isset($xmlType['idbuspro_kontingent_aus']) ? (string) $xmlType['idbuspro_kontingent_aus'] : null, 'pax' => (int) $xmlType['pax_max'], 'code' => $code, 'label' => (string) $xmlType['zimmerbezeichnung'], @@ -233,63 +236,62 @@ class ContingentImportService implements SingletonInterface, LoggerAwareInterfac protected function parseRooms(\SimpleXMLElement $xmlDates, array $hotelData, array $roomTypes) { $dateCount = 0; - foreach ($xmlDates->kapazitaet as $xmlDate) - { + foreach ($xmlDates->kapazitaet as $xmlDate) { $date = \DateTime::createFromFormat('d.m.Y', (string) $xmlDate['termin']); - $status = Contingent::STATUS_OK; - foreach ($xmlDate->zimmerliste->children() as $xmlRoom) - { - $roomTypeBusProId = (string) $xmlRoom['idbuspro']; - if (!array_key_exists($roomTypeBusProId, $roomTypes)) { - continue; - } - $roomType = $roomTypes[$roomTypeBusProId]; + foreach ($roomTypes as $roomType) { $roomCode = $roomType['code']; if (in_array($roomCode, $this->ignoredRoomTypes, true)) { continue; } - $availablePax = 0; - $capacity = 0; - if ($roomType['ctrl'] === true) { - if ((string) $xmlRoom['status'] === 'A') { - $status = Contingent::STATUS_ONREQUEST; - } - if ((string) $xmlRoom['status'] === 'S') { - $status = Contingent::STATUS_BLOCKED; - } - } else { - $capacity = (int) $xmlRoom['kontingent'] * (int) $roomType['pax']; - $availableRooms = (int) $xmlRoom['frei'] > 0 ? (int) $xmlRoom['frei'] : 0; - $availablePax = $availableRooms * $roomType['pax']; - } - $minPrice = (int) $xmlRoom['abpreis']; - $minNights = (int) $xmlRoom['abpreis_naechte']; - $additionalNightMinPrice = (int) $xmlRoom['abpreis_verlaengerung']; - $additionalNightMinNights = (int) $xmlRoom['abpreis_verlaengerung_naechte']; - $roomLabel = $roomType['label']; - $this->db->insert( - 'tx_epproducts_domain_model_contingent_temp', - [ - 'pid' => $this->pid, - 'hotel' => $hotelData['uid'], - 'hotel_code' => $hotelData['code'], - 'hotel_bus_pro_id' => $hotelData['busProId'], - 'room_code' => $roomCode, - 'room_label' => $roomLabel, - 'pax' => $capacity, - 'available' => $availablePax, - 'status' => $status, - 'date' => $date->format('Y-m-d'), - 'min_price' => $minPrice, - 'min_nights' => $minNights, - 'additional_night_min_price' => $additionalNightMinPrice, - 'additional_night_min_nights' => $additionalNightMinNights, - ] - ); + $roomTypeBusProId = $roomType['link'] ?? $roomType['idBusPro']; + $xpath = sprintf('zimmerliste/zimmer[@idbuspro="%d"]', $roomTypeBusProId); + $xmlRoom = $xmlDate->xpath($xpath)[0]; + $this->calculateContingent($xmlRoom, $roomType, $date, $hotelData); } $dateCount++; } + return $dateCount; } + protected function calculateContingent(\SimpleXMLElement $xmlRoom, array $roomType, \DateTime $date, array $hotelData): void + { + $availablePax = 0; + $capacity = 0; + $status = Contingent::STATUS_OK; + $isControlRoom = $roomType['ctrl'] === true; + if ($isControlRoom && (string) $xmlRoom['status'] === 'A') { + $status = Contingent::STATUS_ONREQUEST; + } elseif ($isControlRoom && (string) $xmlRoom['status'] === 'S') { + $status = Contingent::STATUS_BLOCKED; + } else { + $capacity = (int) $xmlRoom['kontingent'] * (int) $roomType['pax']; + $availableRooms = (int) $xmlRoom['frei'] > 0 ? (int) $xmlRoom['frei'] : 0; + $availablePax = $availableRooms * $roomType['pax']; + } + $minPrice = (int) $xmlRoom['abpreis']; + $minNights = (int) $xmlRoom['abpreis_naechte']; + $additionalNightMinPrice = (int) $xmlRoom['abpreis_verlaengerung']; + $additionalNightMinNights = (int) $xmlRoom['abpreis_verlaengerung_naechte']; + $roomLabel = $roomType['label']; + $this->db->insert( + 'tx_epproducts_domain_model_contingent_temp', + [ + 'pid' => $this->pid, + 'hotel' => $hotelData['uid'], + 'hotel_code' => $hotelData['code'], + 'hotel_bus_pro_id' => $hotelData['busProId'], + 'room_code' => $roomType['code'], + 'room_label' => $roomLabel, + 'pax' => $capacity, + 'available' => $availablePax, + 'status' => $status, + 'date' => $date->format('Y-m-d'), + 'min_price' => $minPrice, + 'min_nights' => $minNights, + 'additional_night_min_price' => $additionalNightMinPrice, + 'additional_night_min_nights' => $additionalNightMinNights, + ] + ); + } } diff --git a/public/typo3conf/ext/ep_products/Configuration/Commands.php b/public/typo3conf/ext/ep_products/Configuration/Commands.php index f6430e22..96c19841 100644 --- a/public/typo3conf/ext/ep_products/Configuration/Commands.php +++ b/public/typo3conf/ext/ep_products/Configuration/Commands.php @@ -8,4 +8,8 @@ return [ 'ep:groups-swiss' => [ 'class' => \EP\EpProducts\Command\GroupsSwissCommand::class, ], + 'ep:contingent-import' => [ + 'class' => \EP\EpProducts\Command\ContingentCommand::class, + 'scheduleable' => false, + ], ]; diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/OneColumn.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/OneColumn.html index 4f1f6036..90a362dd 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/OneColumn.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/OneColumn.html @@ -1,40 +1,30 @@ - - - - - - - - - - - - - - - - - -
- - - - -
-
- {data.header -> f:format.nl2br()}{f:if(condition: data.subheader, then: '
{data.subheader}')}
-
- {data.bodytext -> f:format.html()} -
- + +
+ + + + +
+
+ + {data.header -> f:format.nl2br()}{f:if(condition: data.subheader, then: '
{data.subheader}')} +
+
+ {data.bodytext -> f:format.html()} +
+ +
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/TwoColumn.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/TwoColumn.html index 551ac8f4..2f9c85f5 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/TwoColumn.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/TwoColumn.html @@ -3,35 +3,23 @@ xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> - - - - - - - - - - - - - - - - - - - -
- -
-
- {data.header -> f:format.nl2br()}{f:if(condition: data.subheader, then: '
{data.subheader}')}
-
- {data.bodytext -> f:format.html()} -
- + +
+ +
+
+ + {data.header -> f:format.nl2br()}{f:if(condition: data.subheader, then: '
{data.subheader}')} +
+
+ {data.bodytext -> f:format.html()} +
+ +