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] 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',