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
2020-05-04 09:56:55 +02:00
parent e91a26d61f 030c9a2239
commit 3b88e45031
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_products/Classes/Controller/GroupsPriceController.php
+7 -1
View File
@@ -34,8 +34,14 @@ class GroupsPriceController extends ActionController
{
public function indexAction(Hotel $hotel)
{
// Sort configs by date to properly determine earliest date in js component
$configs = $hotel->getGroupsPriceConfigs()->toArray();
uasort($configs, function ($a, $b) {
return $a->getDateFrom() > $b->getDateFrom();
});
$this->view->assign('hotel', $hotel);
$this->view->assign('configs', json_encode($hotel->getGroupsPriceConfigs()->toArray()));
$this->view->assign('configs', json_encode($configs));
$this->view->assign('boards', json_encode($hotel->getGroupsPriceBoards()->toArray()));
$this->view->assign('options', json_encode($hotel->getGroupsPriceOptions()->toArray()));
}
public/typo3conf/ext/ep_products/Classes/Controller/ProductController.php
+2 -1
View File
@@ -143,7 +143,8 @@ class ProductController extends ActionController
}
// Use first hotel which should be the only one at this point
if ($product->getHotels()->count() > 0) {
$hotel = reset($product->getHotels()->toArray());
$hotels = $product->getHotels()->toArray();
$hotel = reset($hotels);
}
}