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-09-03 10:45:42 +02:00
parent f782e32fd3 eed1947e19
commit 7bdb41eba1
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_products/Classes/Controller/AjaxContingentController.php
+2 -1
View File
@@ -94,7 +94,8 @@ class AjaxContingentController extends ActionController
*/ */
public function roomsAction(Hotel $hotel, Product $product, \DateTime $dateFrom, \DateTime $dateTo) public function roomsAction(Hotel $hotel, Product $product, \DateTime $dateFrom, \DateTime $dateTo)
{ {
$rooms = $this->contingentDataService->getAvailableRooms($dateFrom, $dateTo, $hotel, $product); $template = $this->settings['bpnBookingUrlTemplateCode'];
$rooms = $this->contingentDataService->getAvailableRooms($dateFrom, $dateTo, $hotel, $product, $template);
return \json_encode($rooms); return \json_encode($rooms);
} }
public/typo3conf/ext/ep_products/Classes/Service/ContingentDataService.php
+9 -2
View File
@@ -76,11 +76,17 @@ class ContingentDataService
* @param \DateTime $dateTo * @param \DateTime $dateTo
* @param Hotel $hotel * @param Hotel $hotel
* @param Product $product * @param Product $product
* @param string $template
* @return array * @return array
* @throws \Doctrine\DBAL\DBALException * @throws \Doctrine\DBAL\DBALException
*/ */
public function getAvailableRooms(\DateTime $dateFrom, \DateTime $dateTo, Hotel $hotel, Product $product) public function getAvailableRooms(
{ \DateTime $dateFrom,
\DateTime $dateTo,
Hotel $hotel,
Product $product,
$template = 'base'
) {
$data = $this->contingentRepository->getAvailableRooms($dateFrom, $dateTo, $hotel, $product); $data = $this->contingentRepository->getAvailableRooms($dateFrom, $dateTo, $hotel, $product);
$rooms = []; $rooms = [];
@@ -91,6 +97,7 @@ class ContingentDataService
'bookingId' => $row['busProId'], 'bookingId' => $row['busProId'],
'hotelId' => $row['hotelBusProId'], 'hotelId' => $row['hotelBusProId'],
'dateEnd' => $dateTo->format('Y-m-d'), 'dateEnd' => $dateTo->format('Y-m-d'),
'template' => $template,
]); ]);
$row['servicesIncluded'] = unserialize($row['servicesIncluded']); $row['servicesIncluded'] = unserialize($row['servicesIncluded']);
public/typo3conf/ext/ep_products/Configuration/TypoScript/setup.typoscript
+1
View File
@@ -41,6 +41,7 @@ plugin.tx_epproducts {
resellerExportPageUid = {$plugin.tx_epproducts.settings.resellerExportPageUid} resellerExportPageUid = {$plugin.tx_epproducts.settings.resellerExportPageUid}
ratingPageUid = {$plugin.tx_eptheme.settings.ratingPageUid} ratingPageUid = {$plugin.tx_eptheme.settings.ratingPageUid}
searchPageHeaderImage = {$plugin.tx_eptheme.settings.searchPageHeaderImage} searchPageHeaderImage = {$plugin.tx_eptheme.settings.searchPageHeaderImage}
bpnBookingUrlTemplateCode = {$plugin.tx_eptheme.settings.bpnBookingUrlTemplateCode}
datePickerPresets { datePickerPresets {
1 { 1 {
label = Silvester label = Silvester