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

Fix reseller export

Browse Source
This commit is contained in:
Björn Fromme
2021-10-12 21:10:30 +02:00
parent c6bb54e8de
commit 647e471fe2
4 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_products/Classes/CsvFormatter/FacebookCatalogCsvFormatter.php
+7
View File
@@ -25,10 +25,17 @@ class FacebookCatalogCsvFormatter
];
foreach ($data['product'] as $product) {
if (!isset($product['hotels']['hotel'])) {
continue;
}
$minPrice = 0;
$available = 0;
foreach ($product['hotels']['hotel'] as $hotel) {
if (!isset($hotel['dates']['date'])) {
continue;
}
foreach ($hotel['dates']['date'] as $date) {
if ($minPrice === 0 || $date['minprice'] < $minPrice) {
$minPrice = $date['minprice'];
public/typo3conf/ext/ep_products/Classes/CsvFormatter/GoogleBusinessFeedCsvFormatter.php
+7
View File
@@ -22,10 +22,17 @@ class GoogleBusinessFeedCsvFormatter
];
foreach ($data['product'] as $product) {
if (!isset($product['hotels']['hotel'])) {
continue;
}
$minPrice = 0;
$available = 0;
foreach ($product['hotels']['hotel'] as $hotel) {
if (!isset($hotel['dates']['date'])) {
continue;
}
foreach ($hotel['dates']['date'] as $date) {
if ($minPrice === 0 || $date['minprice'] < $minPrice) {
$minPrice = $date['minprice'];
public/typo3conf/ext/ep_products/Classes/Domain/Serialization/Product.php
+10 -2
View File
@@ -29,6 +29,8 @@ namespace EP\EpProducts\Domain\Serialization;
use EP\EpProducts\Domain\Model\Fact;
use EP\EpProducts\Utility\SerializationUtility;
use TYPO3\CMS\Core\Site\SiteFinder;
use TYPO3\CMS\Core\Utility\GeneralUtility;
class Product
{
@@ -84,8 +86,14 @@ class Product
];
}
$link = $entity->getExternalLink() ?: $entity->getDetailPage();
$product['link'] = SerializationUtility::generateLink($link, $queryData);
if ($entity->getExternalLink()) {
$product['link'] = $entity->getExternalLink();
} else {
/** @var SiteFinder $siteFinder */
$siteFinder = GeneralUtility::makeInstance(SiteFinder::class);
$site = $siteFinder->getSiteByIdentifier('ep-reisen');
$product['link'] = $site->getRouter()->generateUri($entity->getDetailPage(), $queryData);
}
$product['region'] = Region::fromEntity($entity->getRegion());
$product['city'] = City::fromEntity($entity->getCity());
public/typo3conf/ext/ep_products/Classes/Utility/SerializationUtility.php
-23
View File
@@ -91,29 +91,6 @@ class SerializationUtility
return $data;
}
/**
* @param string $parameter
* @param array $queryData
* @return string
*/
public static function generateLink($parameter, array $queryData = [])
{
if (static::$contentObject === null) {
/** @var ContentObjectRenderer $contentObject */
static::$contentObject = GeneralUtility::makeInstance(ContentObjectRenderer::class);
}
$url = static::$contentObject->typoLink_URL([ 'parameter' => $parameter, 'forceAbsoluteUrl' => true ]);
if ($queryData) {
$query = http_build_query($queryData);
$divider = strpos($url, '?') !== false ? '&' : '?';
$url .= $divider . $query;
}
return $url;
}
/**
* @return ImageService
*/