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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Björn Fromme
2019-10-24 14:14:47 +02:00
parent 9f406638e9 0f9187a049
commit 9f102a8f1a
5 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+27 -26
View File
@@ -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",
config/sites/ep-reisen/config.yaml
+1 -1
View File
@@ -125,7 +125,7 @@ routeEnhancers:
extension: EpProducts
plugin: booking_link
limitToPages:
- 1787
- 1846
routes:
-
routePath: '/{product}'
public/typo3conf/ext/ep_products/Classes/Controller/AjaxDateController.php
+3 -3
View File
@@ -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,
public/typo3conf/ext/ep_products/Classes/Controller/AjaxTableController.php
+4 -5
View File
@@ -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,
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ProductDetail.vue
+5 -1
View File
@@ -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',