From 55ef8cc4e39d99b1c9ea35362e5e4559242278d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Thu, 24 Oct 2019 14:13:18 +0200 Subject: [PATCH 1/3] Update project dependencies --- composer.lock | 53 ++++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/composer.lock b/composer.lock index ec0298dc..e1744a0c 100644 --- a/composer.lock +++ b/composer.lock @@ -870,27 +870,28 @@ }, { "name": "guzzlehttp/guzzle", - "version": "6.3.3", + "version": "6.4.1", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba" + "reference": "0895c932405407fd3a7368b6910c09a24d26db11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba", - "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/0895c932405407fd3a7368b6910c09a24d26db11", + "reference": "0895c932405407fd3a7368b6910c09a24d26db11", "shasum": "" }, "require": { + "ext-json": "*", "guzzlehttp/promises": "^1.0", - "guzzlehttp/psr7": "^1.4", + "guzzlehttp/psr7": "^1.6.1", "php": ">=5.5" }, "require-dev": { "ext-curl": "*", "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", - "psr/log": "^1.0" + "psr/log": "^1.1" }, "suggest": { "psr/log": "Required for using the Log middleware" @@ -902,12 +903,12 @@ } }, "autoload": { - "files": [ - "src/functions_include.php" - ], "psr-4": { "GuzzleHttp\\": "src/" - } + }, + "files": [ + "src/functions_include.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -931,7 +932,7 @@ "rest", "web service" ], - "time": "2018-04-22T15:46:56+00:00" + "time": "2019-10-23T15:58:00+00:00" }, { "name": "guzzlehttp/promises", @@ -1247,16 +1248,16 @@ }, { "name": "league/csv", - "version": "9.4.0", + "version": "9.4.1", "source": { "type": "git", "url": "https://github.com/thephpleague/csv.git", - "reference": "e7225b6cc853942caef1c9c4d8889b716c34bc04" + "reference": "bf83acc23a7d60978fce36a384f97bf9d7d2ea0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/csv/zipball/e7225b6cc853942caef1c9c4d8889b716c34bc04", - "reference": "e7225b6cc853942caef1c9c4d8889b716c34bc04", + "url": "https://api.github.com/repos/thephpleague/csv/zipball/bf83acc23a7d60978fce36a384f97bf9d7d2ea0c", + "reference": "bf83acc23a7d60978fce36a384f97bf9d7d2ea0c", "shasum": "" }, "require": { @@ -1312,7 +1313,7 @@ "read", "write" ], - "time": "2019-10-02T18:32:54+00:00" + "time": "2019-10-17T06:05:32+00:00" }, { "name": "nikic/php-parser", @@ -4972,16 +4973,16 @@ }, { "name": "typo3/phar-stream-wrapper", - "version": "v3.1.2", + "version": "v3.1.3", "source": { "type": "git", "url": "https://github.com/TYPO3/phar-stream-wrapper.git", - "reference": "df7609a2f6cc4013d7bd12f1a2412d127b28f771" + "reference": "586ff60beea128e069a5dc271d3d8133a9bc460a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3/phar-stream-wrapper/zipball/df7609a2f6cc4013d7bd12f1a2412d127b28f771", - "reference": "df7609a2f6cc4013d7bd12f1a2412d127b28f771", + "url": "https://api.github.com/repos/TYPO3/phar-stream-wrapper/zipball/586ff60beea128e069a5dc271d3d8133a9bc460a", + "reference": "586ff60beea128e069a5dc271d3d8133a9bc460a", "shasum": "" }, "require": { @@ -5018,20 +5019,20 @@ "security", "stream-wrapper" ], - "time": "2019-05-14T13:14:14+00:00" + "time": "2019-10-18T11:57:16+00:00" }, { "name": "typo3fluid/fluid", - "version": "2.6.4", + "version": "2.6.5", "source": { "type": "git", "url": "https://github.com/TYPO3/Fluid.git", - "reference": "75a3a58c2ee1edf1c3b5c0d5bc815e9252afba80" + "reference": "53eb2aa5395422ee00019bb28bc5d1b3c6916705" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3/Fluid/zipball/75a3a58c2ee1edf1c3b5c0d5bc815e9252afba80", - "reference": "75a3a58c2ee1edf1c3b5c0d5bc815e9252afba80", + "url": "https://api.github.com/repos/TYPO3/Fluid/zipball/53eb2aa5395422ee00019bb28bc5d1b3c6916705", + "reference": "53eb2aa5395422ee00019bb28bc5d1b3c6916705", "shasum": "" }, "require": { @@ -5057,7 +5058,7 @@ "LGPL-3.0-or-later" ], "description": "The TYPO3 Fluid template rendering engine", - "time": "2019-09-13T09:38:15+00:00" + "time": "2019-10-21T09:41:33+00:00" }, { "name": "wazum/pagetree-resizable", From c9c03abcde795bd85095940f7cb0a04deb7dcbf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Thu, 24 Oct 2019 14:13:37 +0200 Subject: [PATCH 2/3] Adjust page id to current prod data --- config/sites/ep-reisen/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/sites/ep-reisen/config.yaml b/config/sites/ep-reisen/config.yaml index 0e825788..5f9dc1d3 100644 --- a/config/sites/ep-reisen/config.yaml +++ b/config/sites/ep-reisen/config.yaml @@ -125,7 +125,7 @@ routeEnhancers: extension: EpProducts plugin: booking_link limitToPages: - - 1787 + - 1846 routes: - routePath: '/{product}' From 9fa7529fc2675b8f10397143b8406c40a76db14a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Thu, 24 Oct 2019 14:14:38 +0200 Subject: [PATCH 3/3] Ensure pacode being appended to links in ajax generated tables --- .../Classes/Controller/AjaxDateController.php | 6 +++--- .../Classes/Controller/AjaxTableController.php | 9 ++++----- .../Private/Assets/js/components/ProductDetail.vue | 6 +++++- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/public/typo3conf/ext/ep_products/Classes/Controller/AjaxDateController.php b/public/typo3conf/ext/ep_products/Classes/Controller/AjaxDateController.php index a28c6bf6..1ee271c2 100644 --- a/public/typo3conf/ext/ep_products/Classes/Controller/AjaxDateController.php +++ b/public/typo3conf/ext/ep_products/Classes/Controller/AjaxDateController.php @@ -94,10 +94,12 @@ class AjaxDateController extends ActionController /** * @param Product $product * @param Hotel $hotel + * @param string $paCode * * @return string + * @throws \Doctrine\DBAL\DBALException */ - public function datesAction(Product $product, Hotel $hotel = null) + public function datesAction(Product $product, Hotel $hotel = null, $paCode = null) { if ($hotel === null) { return json_encode([ @@ -128,8 +130,6 @@ class AjaxDateController extends ActionController } if ($reseller = $this->resellerDataService->getResellerForCurrentDomain()) { $paCode = $reseller['paCode']; - } else { - $paCode = null; } $datesTable = $this->dateService->getDatesTable([ 'product' => $product, diff --git a/public/typo3conf/ext/ep_products/Classes/Controller/AjaxTableController.php b/public/typo3conf/ext/ep_products/Classes/Controller/AjaxTableController.php index 98aff7e6..e841dcc9 100644 --- a/public/typo3conf/ext/ep_products/Classes/Controller/AjaxTableController.php +++ b/public/typo3conf/ext/ep_products/Classes/Controller/AjaxTableController.php @@ -85,6 +85,7 @@ class AjaxTableController extends ActionController * @param Product $product * @param Hotel $hotel * @param Date $date + * @param string $paCode * * @return string * @throws \Doctrine\DBAL\DBALException @@ -93,16 +94,14 @@ class AjaxTableController extends ActionController ( Product $product, Hotel $hotel, - Date $date = null - ) - { + Date $date = null, + $paCode = null + ) { $forcedConceptUids = GeneralUtility::trimExplode(',', $this->settings['forcedConceptUids'], true); $filterSettings = $this->filterService->getDefaultFilterSettings($forcedConceptUids, false); if ($reseller = $this->resellerDataService->getResellerForCurrentDomain()) { $paCode = $reseller['paCode']; - } else { - $paCode = null; } $priceTable = $this->dateService->getPriceTable([ 'product' => $product, diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ProductDetail.vue b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ProductDetail.vue index c33a97ca..cbc22ec8 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ProductDetail.vue +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ProductDetail.vue @@ -93,7 +93,10 @@ this.detailShow = false; axios({ url: this.uris['dates'], - method: 'post' + method: 'post', + data: { + paCode: this.$store.state.config.paCode + } }).then(response => { const json = response.data; if (json.dates.length === 1) { @@ -131,6 +134,7 @@ this.detailShow = false; let query = {}; query[this.argumentPrefix + '[date]'] = dateUid; + query[this.argumentPrefix + '[paCode]'] = this.$store.state.config.paCode; axios({ url: this.uris['pricetable'], method: 'post',