Compare commits
16
Commits
7839b97e63
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
11f46d0acf | ||
|
|
4279669aa3 | ||
|
|
aa3d81102e | ||
|
|
739a4c49f7 | ||
|
|
88e0488b49 | ||
|
|
f57671b4d4 | ||
|
|
313fb151bc | ||
|
|
6350742084 | ||
|
|
ef7d81fe99 | ||
|
|
0477589a7a | ||
|
|
38962845d3 | ||
|
|
c7f43ad02c | ||
|
|
1111c180f8 | ||
|
|
69f9b42757 | ||
|
|
5bb4b6254a | ||
|
|
32b70f9b70 |
No files matched your search
@@ -1,12 +1,42 @@
|
|||||||
|
# Backchannel endpoints MyE&P reads hotel and product data from. Same environment files and key
|
||||||
|
# as content-feed.http: pick "local" and put cmsApiKey in http-client.private.env.json.
|
||||||
|
|
||||||
### GET product data for myep
|
### GET product data for myep
|
||||||
GET https://ep-reisen.ddev.site/api/product
|
GET {{host}}/api/product?product=3VIIN&hotel=VLTS
|
||||||
?product=SSTMR
|
X-Api-Key: {{cmsApiKey}}
|
||||||
&hotel=SSTGR
|
|
||||||
&key=abcabc123
|
> {%
|
||||||
|
client.test("200 with key", function () {
|
||||||
|
client.assert(response.status === 200, "expected 200, got " + response.status);
|
||||||
|
});
|
||||||
|
%}
|
||||||
|
|
||||||
### GET hotel data for myep
|
### GET hotel data for myep
|
||||||
GET https://ep-reisen.ddev.site/api/hotel
|
GET {{host}}/api/hotel?hotel=DPWGRP
|
||||||
?hotel=DPWGRP
|
X-Api-Key: {{cmsApiKey}}
|
||||||
&key=abcabc123
|
|
||||||
|
> {%
|
||||||
|
client.test("200 with key", function () {
|
||||||
|
client.assert(response.status === 200, "expected 200, got " + response.status);
|
||||||
|
});
|
||||||
|
%}
|
||||||
|
|
||||||
|
### Transition form: key as query parameter, as MyE&P sends it today (still accepted)
|
||||||
|
GET {{host}}/api/hotel?hotel=DPWGRP&key={{cmsApiKey}}
|
||||||
|
|
||||||
|
> {%
|
||||||
|
client.test("200 with query key", function () {
|
||||||
|
client.assert(response.status === 200, "expected 200, got " + response.status);
|
||||||
|
});
|
||||||
|
%}
|
||||||
|
|
||||||
|
### Any other value is refused now - this used to pass
|
||||||
|
GET {{host}}/api/hotel?hotel=DPWGRP&key=AbcAbc123
|
||||||
|
|
||||||
|
> {%
|
||||||
|
client.test("403 with the old dummy key", function () {
|
||||||
|
client.assert(response.status === 403, "expected 403, got " + response.status);
|
||||||
|
});
|
||||||
|
%}
|
||||||
|
|
||||||
###
|
###
|
||||||
+4
-1
@@ -70,7 +70,10 @@ host('prod')
|
|||||||
->set('writable_mode', 'chmod')
|
->set('writable_mode', 'chmod')
|
||||||
->set('rsync_src', __DIR__)
|
->set('rsync_src', __DIR__)
|
||||||
->set('rsync', $rsyncOptions)
|
->set('rsync', $rsyncOptions)
|
||||||
->set('cachetool_args', '--web=SymfonyHttpClient --web-path={{current_path}}/{{typo3_webroot}}/ --web-url=https://www.ep-reisen.de')
|
// The temp script goes into the shared typo3temp, which resolves to the same directory from every
|
||||||
|
// release: PHP workers with a stale realpath cache still map "current" to the previous release and
|
||||||
|
// would 404 on a script placed inside the new one.
|
||||||
|
->set('cachetool_args', '--web=SymfonyHttpClient --web-path={{deploy_path}}/shared/{{typo3_webroot}}/typo3temp/ --web-url=https://www.ep-reisen.de/typo3temp')
|
||||||
;
|
;
|
||||||
|
|
||||||
task('deploy', [
|
task('deploy', [
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
"local": {
|
"local": {
|
||||||
"host": "https://ep-reisen.ddev.site"
|
"host": "https://ep-reisen.ddev.site"
|
||||||
},
|
},
|
||||||
"staging": {
|
"prod": {
|
||||||
"host": "https://staging.ep-reisen.de"
|
"host": "https://www.ep-reisen.de"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -285,9 +285,6 @@ AddDefaultCharset utf-8
|
|||||||
<FilesMatch "\.(eot|otf|tt[cf]|woff2?)$">
|
<FilesMatch "\.(eot|otf|tt[cf]|woff2?)$">
|
||||||
Header set Access-Control-Allow-Origin "*"
|
Header set Access-Control-Allow-Origin "*"
|
||||||
</FilesMatch>
|
</FilesMatch>
|
||||||
<FilesMatch "\.(png|gif|jpe?g)$">
|
|
||||||
Header append Vary Accept
|
|
||||||
</FilesMatch>
|
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
### End: Cross Origin ###
|
### End: Cross Origin ###
|
||||||
@@ -395,12 +392,6 @@ AddDefaultCharset utf-8
|
|||||||
# NOTE: Add your additional local storages here
|
# NOTE: Add your additional local storages here
|
||||||
RewriteRule ^(?:typo3/|fileadmin/|typo3conf/|typo3temp/|uploads/|favicon\.ico) - [L]
|
RewriteRule ^(?:typo3/|fileadmin/|typo3conf/|typo3temp/|uploads/|favicon\.ico) - [L]
|
||||||
|
|
||||||
RewriteCond %{HTTP_ACCEPT} image/webp
|
|
||||||
RewriteCond %{REQUEST_FILENAME} (.*)\.(png|gif|jpe?g)$
|
|
||||||
RewriteCond %{REQUEST_FILENAME}\.webp -f
|
|
||||||
RewriteRule ^ %{REQUEST_FILENAME}\.webp [L,T=image/webp]
|
|
||||||
|
|
||||||
|
|
||||||
### Begin: StaticFileCache (preparation) ####
|
### Begin: StaticFileCache (preparation) ####
|
||||||
|
|
||||||
# Document root configuration
|
# Document root configuration
|
||||||
|
|||||||
@@ -90,6 +90,14 @@ $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['rootline']
|
|||||||
// by the CDN, so stop generating them. mod_deflate still compresses direct origin hits.
|
// by the CDN, so stop generating them. mod_deflate still compresses direct origin hits.
|
||||||
$GLOBALS['TYPO3_CONF_VARS']['FE']['compressionLevel'] = 0;
|
$GLOBALS['TYPO3_CONF_VARS']['FE']['compressionLevel'] = 0;
|
||||||
|
|
||||||
|
// utf8 in MySQL/MariaDB is utf8mb3 (max. 3 bytes) and rejects 4-byte characters like emoji.
|
||||||
|
// Set here because LocalConfiguration.php is a Deployer shared file and not deployed from the repo.
|
||||||
|
$GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['charset'] = 'utf8mb4';
|
||||||
|
$GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['tableoptions'] = [
|
||||||
|
'charset' => 'utf8mb4',
|
||||||
|
'collate' => 'utf8mb4_unicode_ci',
|
||||||
|
];
|
||||||
|
|
||||||
// suppress php deprecation warnings flooding typo3 logs
|
// suppress php deprecation warnings flooding typo3 logs
|
||||||
$GLOBALS['TYPO3_CONF_VARS']['SYS']['errorHandlerErrors'] =
|
$GLOBALS['TYPO3_CONF_VARS']['SYS']['errorHandlerErrors'] =
|
||||||
$GLOBALS['TYPO3_CONF_VARS']['SYS']['errorHandlerErrors'] & ~E_DEPRECATED & ~E_USER_DEPRECATED;
|
$GLOBALS['TYPO3_CONF_VARS']['SYS']['errorHandlerErrors'] & ~E_DEPRECATED & ~E_USER_DEPRECATED;
|
||||||
|
|||||||
@@ -59,6 +59,7 @@ call_user_func(function() {
|
|||||||
'label' => 'Reiseart',
|
'label' => 'Reiseart',
|
||||||
'config' => [
|
'config' => [
|
||||||
'type' => 'select',
|
'type' => 'select',
|
||||||
|
'default' => 0,
|
||||||
'renderType' => 'selectSingle',
|
'renderType' => 'selectSingle',
|
||||||
'items' => [
|
'items' => [
|
||||||
['Keine Zuordnung', 0],
|
['Keine Zuordnung', 0],
|
||||||
@@ -74,6 +75,7 @@ call_user_func(function() {
|
|||||||
'label' => 'Angebot/Beispielangebot',
|
'label' => 'Angebot/Beispielangebot',
|
||||||
'config' => [
|
'config' => [
|
||||||
'type' => 'select',
|
'type' => 'select',
|
||||||
|
'default' => 0,
|
||||||
'renderType' => 'selectSingle',
|
'renderType' => 'selectSingle',
|
||||||
'items' => [
|
'items' => [
|
||||||
['Keine Zuordnung', 0],
|
['Keine Zuordnung', 0],
|
||||||
|
|||||||
@@ -114,6 +114,11 @@ class Date extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
|
|||||||
*/
|
*/
|
||||||
protected $skipassIncluded = false;
|
protected $skipassIncluded = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var bool
|
||||||
|
*/
|
||||||
|
protected $groupTravel = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var bool
|
* @var bool
|
||||||
*/
|
*/
|
||||||
@@ -421,6 +426,22 @@ class Date extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
|
|||||||
$this->skipassIncluded = $skipassIncluded;
|
$this->skipassIncluded = $skipassIncluded;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function getGroupTravel()
|
||||||
|
{
|
||||||
|
return $this->groupTravel;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param bool $groupTravel
|
||||||
|
*/
|
||||||
|
public function setGroupTravel($groupTravel)
|
||||||
|
{
|
||||||
|
$this->groupTravel = $groupTravel;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ class DateRepository extends AbstractRepository
|
|||||||
->where(
|
->where(
|
||||||
$qb->expr()->eq('date.product', $qb->createNamedParameter($productUid, Connection::PARAM_INT)),
|
$qb->expr()->eq('date.product', $qb->createNamedParameter($productUid, Connection::PARAM_INT)),
|
||||||
$qb->expr()->eq('date.hotel', $qb->createNamedParameter($hotelUid, Connection::PARAM_INT)),
|
$qb->expr()->eq('date.hotel', $qb->createNamedParameter($hotelUid, Connection::PARAM_INT)),
|
||||||
|
$qb->expr()->eq('date.group_travel', $qb->createNamedParameter(0, Connection::PARAM_INT)),
|
||||||
'date.date_start >= NOW()'
|
'date.date_start >= NOW()'
|
||||||
)
|
)
|
||||||
->orderBy('date.date_start', 'DESC')
|
->orderBy('date.date_start', 'DESC')
|
||||||
|
|||||||
@@ -210,6 +210,7 @@ class ProductRepository extends AbstractRepository
|
|||||||
'date.uid as dateUid', 'date.date_start as dateStart', 'date.date_end as dateEnd',
|
'date.uid as dateUid', 'date.date_start as dateStart', 'date.date_end as dateEnd',
|
||||||
'date.bus_pro_id as dateBusProId', 'date.hotel as hotelUid', 'date.hotel_bus_pro_id as hotelBusProId',
|
'date.bus_pro_id as dateBusProId', 'date.hotel as hotelUid', 'date.hotel_bus_pro_id as hotelBusProId',
|
||||||
'date.bus_included as dateBusIncluded', 'date.skipass_included as dateSkiPassIncluded',
|
'date.bus_included as dateBusIncluded', 'date.skipass_included as dateSkiPassIncluded',
|
||||||
|
'date.group_travel as dateGroupTravel',
|
||||||
'date.season as season', 'date.product_detail_page as productDetailPage',
|
'date.season as season', 'date.product_detail_page as productDetailPage',
|
||||||
'room.uid as roomUid', 'room.bus_pro_id as roomBusProId', 'room.name as roomName',
|
'room.uid as roomUid', 'room.bus_pro_id as roomBusProId', 'room.name as roomName',
|
||||||
'room.price as roomPrice', 'date.discount as roomDiscount', 'date.bus_price as busPrice',
|
'room.price as roomPrice', 'date.discount as roomDiscount', 'date.bus_price as busPrice',
|
||||||
@@ -273,6 +274,7 @@ class ProductRepository extends AbstractRepository
|
|||||||
'date.discount as dateDiscount', 'date.bus_price as busPrice', 'date.nights as dateNights',
|
'date.discount as dateDiscount', 'date.bus_price as busPrice', 'date.nights as dateNights',
|
||||||
'date.bus_included as dateBusIncluded', 'date.services_included as dateServicesIncluded',
|
'date.bus_included as dateBusIncluded', 'date.services_included as dateServicesIncluded',
|
||||||
'date.services_general as dateServicesGeneral', 'date.skipass_included as dateSkiPassIncluded',
|
'date.services_general as dateServicesGeneral', 'date.skipass_included as dateSkiPassIncluded',
|
||||||
|
'date.group_travel as dateGroupTravel',
|
||||||
'date.bus_pro_id as dateBusProId', 'date.hotel_bus_pro_id as hotelBusProId',
|
'date.bus_pro_id as dateBusProId', 'date.hotel_bus_pro_id as hotelBusProId',
|
||||||
'date.available as available', 'date.product_detail_page as productDetailPage',
|
'date.available as available', 'date.product_detail_page as productDetailPage',
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
namespace EP\EpProducts\Middleware;
|
namespace EP\EpProducts\Middleware;
|
||||||
|
|
||||||
use EP\EpProducts\ContentFeed\ContentFeedApi;
|
use EP\EpProducts\ContentFeed\ContentFeedApi;
|
||||||
|
use EP\EpProducts\Http\ApiKeyAuthenticator;
|
||||||
use EP\EpProducts\Service\MyEpImageService;
|
use EP\EpProducts\Service\MyEpImageService;
|
||||||
use EP\EpProducts\Utility\HotelIconUtility;
|
use EP\EpProducts\Utility\HotelIconUtility;
|
||||||
use Psr\Http\Message\ResponseInterface;
|
use Psr\Http\Message\ResponseInterface;
|
||||||
@@ -47,13 +48,19 @@ class ApiMiddleware implements MiddlewareInterface
|
|||||||
*/
|
*/
|
||||||
private $contentFeedApi;
|
private $contentFeedApi;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var ApiKeyAuthenticator
|
||||||
|
*/
|
||||||
|
private $authenticator;
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
MyEpImageService $hotelImageService,
|
MyEpImageService $hotelImageService,
|
||||||
MyEpImageService $productImageService,
|
MyEpImageService $productImageService,
|
||||||
MyEpImageService $regionImageService,
|
MyEpImageService $regionImageService,
|
||||||
FileRepository $fileRepository,
|
FileRepository $fileRepository,
|
||||||
ImageService $imageService,
|
ImageService $imageService,
|
||||||
ContentFeedApi $contentFeedApi
|
ContentFeedApi $contentFeedApi,
|
||||||
|
ApiKeyAuthenticator $authenticator
|
||||||
) {
|
) {
|
||||||
$this->hotelImageService = $hotelImageService;
|
$this->hotelImageService = $hotelImageService;
|
||||||
$this->productImageService = $productImageService;
|
$this->productImageService = $productImageService;
|
||||||
@@ -61,6 +68,7 @@ class ApiMiddleware implements MiddlewareInterface
|
|||||||
$this->fileRepository = $fileRepository;
|
$this->fileRepository = $fileRepository;
|
||||||
$this->imageService = $imageService;
|
$this->imageService = $imageService;
|
||||||
$this->contentFeedApi = $contentFeedApi;
|
$this->contentFeedApi = $contentFeedApi;
|
||||||
|
$this->authenticator = $authenticator;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
|
public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
|
||||||
@@ -84,12 +92,8 @@ class ApiMiddleware implements MiddlewareInterface
|
|||||||
|
|
||||||
private function handleHotelRequest(ServerRequestInterface $request): ResponseInterface
|
private function handleHotelRequest(ServerRequestInterface $request): ResponseInterface
|
||||||
{
|
{
|
||||||
// This is currently fake, we only check for existence. Since we are communicating
|
if (!$this->authenticator->isAuthorized($request)) {
|
||||||
// on the backchannel only it's not much of a problem.
|
return new JsonResponse(['message' => 'Invalid or missing api key'], 403);
|
||||||
$apiKey = $request->getQueryParams()['key'] ?? null;
|
|
||||||
|
|
||||||
if (null === $apiKey) {
|
|
||||||
return new JsonResponse(['message' => 'No api key provided'], 403);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$hotelCode = $request->getQueryParams()['hotel'] ?? null;
|
$hotelCode = $request->getQueryParams()['hotel'] ?? null;
|
||||||
@@ -109,12 +113,8 @@ class ApiMiddleware implements MiddlewareInterface
|
|||||||
|
|
||||||
private function handleProductRequest(ServerRequestInterface $request): ResponseInterface
|
private function handleProductRequest(ServerRequestInterface $request): ResponseInterface
|
||||||
{
|
{
|
||||||
// This is currently fake, we only check for existence. Since we are communicating
|
if (!$this->authenticator->isAuthorized($request)) {
|
||||||
// on the backchannel only it's not much of a problem.
|
return new JsonResponse(['message' => 'Invalid or missing api key'], 403);
|
||||||
$apiKey = $request->getQueryParams()['key'] ?? null;
|
|
||||||
|
|
||||||
if (null === $apiKey) {
|
|
||||||
return new JsonResponse(['message' => 'No api key provided'], 403);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$productCode = $request->getQueryParams()['product'] ?? null;
|
$productCode = $request->getQueryParams()['product'] ?? null;
|
||||||
|
|||||||
@@ -64,6 +64,22 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
|
|||||||
const SELECTION_GROUP_EVENTS = 89;
|
const SELECTION_GROUP_EVENTS = 89;
|
||||||
const SELECTION_GROUP_TRANSPORTATION = 90;
|
const SELECTION_GROUP_TRANSPORTATION = 90;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Group 'Kunde' also carries trip types (Wochenreise, Midweekreise, ...), so
|
||||||
|
* group travel keys on the selection, not on the group's presence. Every
|
||||||
|
* date should carry either 'Gruppenkunde' or 'Endkunde'.
|
||||||
|
*/
|
||||||
|
const SELECTION_GROUP_CUSTOMER = 96;
|
||||||
|
const SELECTION_CUSTOMER_GROUP = 1418;
|
||||||
|
const SELECTION_CUSTOMER_END = 1419;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fallback for dates the office has not tagged with either selection: these
|
||||||
|
* trip type markers in front of the travel code's trailing date mean
|
||||||
|
* end-customer travel.
|
||||||
|
*/
|
||||||
|
const END_CUSTOMER_CODE_PATTERN = '/(?:MP|WE|KT|PM|MW|FA)\d{6}$/';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 'Leistungen Personal' occurs in no export so far, so its id is unknown and
|
* 'Leistungen Personal' occurs in no export so far, so its id is unknown and
|
||||||
* it is still matched by label. Register its id once the warning fires.
|
* it is still matched by label. Register its id once the warning fires.
|
||||||
@@ -286,6 +302,9 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
|
|||||||
{
|
{
|
||||||
$dateCount = 0;
|
$dateCount = 0;
|
||||||
|
|
||||||
|
// Selection groups are date-level, so any hotel row tells.
|
||||||
|
$this->checkCustomerSelection(reset($rows));
|
||||||
|
|
||||||
foreach ($rows as $row) {
|
foreach ($rows as $row) {
|
||||||
$date = $this->createDateRecord($product, $row);
|
$date = $this->createDateRecord($product, $row);
|
||||||
|
|
||||||
@@ -410,6 +429,8 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
|
|||||||
$skiPassIncluded = (int) (count($includedSkiPass) > 0);
|
$skiPassIncluded = (int) (count($includedSkiPass) > 0);
|
||||||
$date['skipass_included'] = $skiPassIncluded;
|
$date['skipass_included'] = $skiPassIncluded;
|
||||||
|
|
||||||
|
$date['group_travel'] = (int) $this->isGroupTravel($row);
|
||||||
|
|
||||||
$servicesTransportation = $this->parseService($row['transportServices']);
|
$servicesTransportation = $this->parseService($row['transportServices']);
|
||||||
$discount = $this->determineDiscount($servicesTransportation);
|
$discount = $this->determineDiscount($servicesTransportation);
|
||||||
$date['discount'] = $discount;
|
$date['discount'] = $discount;
|
||||||
@@ -771,6 +792,49 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
|
|||||||
return $data;
|
return $data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 'Gruppenkunde' and 'Endkunde' decide. A date carrying neither is judged by
|
||||||
|
* its travel code.
|
||||||
|
*
|
||||||
|
* @param array $row
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
protected function isGroupTravel(array $row): bool
|
||||||
|
{
|
||||||
|
$customer = $this->parseSelectionGroup($row['selectionGroups'], static::SELECTION_GROUP_CUSTOMER);
|
||||||
|
$isGroup = isset($customer[static::SELECTION_CUSTOMER_GROUP]);
|
||||||
|
$isEnd = isset($customer[static::SELECTION_CUSTOMER_END]);
|
||||||
|
if ($isGroup || $isEnd) {
|
||||||
|
return $isGroup;
|
||||||
|
}
|
||||||
|
|
||||||
|
return !preg_match(static::END_CUSTOMER_CODE_PATTERN, (string) $row['date']['code']);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reports dates whose customer selection is missing or contradictory, along
|
||||||
|
* with what they import as.
|
||||||
|
*
|
||||||
|
* @param array $row
|
||||||
|
*/
|
||||||
|
protected function checkCustomerSelection(array $row): void
|
||||||
|
{
|
||||||
|
$customer = $this->parseSelectionGroup($row['selectionGroups'], static::SELECTION_GROUP_CUSTOMER);
|
||||||
|
$isGroup = isset($customer[static::SELECTION_CUSTOMER_GROUP]);
|
||||||
|
$isEnd = isset($customer[static::SELECTION_CUSTOMER_END]);
|
||||||
|
if ($isGroup !== $isEnd) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->logger->warning(
|
||||||
|
$isGroup
|
||||||
|
? 'date has both Gruppenkunde and Endkunde selected, importing as group travel'
|
||||||
|
: 'date has neither Gruppenkunde nor Endkunde selected, falling back to travel code, importing as '
|
||||||
|
. ($this->isGroupTravel($row) ? 'group travel' : 'end-customer travel'),
|
||||||
|
['product' => $row['product']['code'], 'date' => $row['date']['code']]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param array[] $selections
|
* @param array[] $selections
|
||||||
* @param array $data
|
* @param array $data
|
||||||
|
|||||||
@@ -230,6 +230,7 @@ class DateService implements SingletonInterface
|
|||||||
'summer' => $row['season'] === 's',
|
'summer' => $row['season'] === 's',
|
||||||
'busIncluded' => (bool) $row['dateBusIncluded'],
|
'busIncluded' => (bool) $row['dateBusIncluded'],
|
||||||
'skiPassIncluded' => (bool) $row['dateSkiPassIncluded'],
|
'skiPassIncluded' => (bool) $row['dateSkiPassIncluded'],
|
||||||
|
'groupTravel' => (bool) $row['dateGroupTravel'],
|
||||||
'roomUid' => $row['roomUid'],
|
'roomUid' => $row['roomUid'],
|
||||||
'roomName' => $row['roomName'],
|
'roomName' => $row['roomName'],
|
||||||
'available' => $row['roomAvailable'] && $row['roomPrice'],
|
'available' => $row['roomAvailable'] && $row['roomPrice'],
|
||||||
@@ -320,6 +321,7 @@ class DateService implements SingletonInterface
|
|||||||
'nights' => $row['dateNights'],
|
'nights' => $row['dateNights'],
|
||||||
'busIncluded' => (bool) $row['dateBusIncluded'],
|
'busIncluded' => (bool) $row['dateBusIncluded'],
|
||||||
'skiPassIncluded' => (bool) $row['dateSkiPassIncluded'],
|
'skiPassIncluded' => (bool) $row['dateSkiPassIncluded'],
|
||||||
|
'groupTravel' => (bool) $row['dateGroupTravel'],
|
||||||
'servicesIncluded' => unserialize($row['dateServicesIncluded'], ['allowed_classes' => false]),
|
'servicesIncluded' => unserialize($row['dateServicesIncluded'], ['allowed_classes' => false]),
|
||||||
'servicesGeneral' => unserialize($row['dateServicesGeneral'], ['allowed_classes' => false]),
|
'servicesGeneral' => unserialize($row['dateServicesGeneral'], ['allowed_classes' => false]),
|
||||||
'season' => $row['season'],
|
'season' => $row['season'],
|
||||||
|
|||||||
@@ -7,10 +7,12 @@ use EP\EpProducts\Domain\Model\Product;
|
|||||||
use EP\EpProducts\Domain\Repository\DateRepository;
|
use EP\EpProducts\Domain\Repository\DateRepository;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Lists the pickup points of a product's latest upcoming date that has any,
|
* Lists the pickup points of a product's latest upcoming end-customer date that
|
||||||
* with that date's time and round-trip surcharge per pickup point. Pickups,
|
* has any, with that date's time and round-trip surcharge per pickup point.
|
||||||
* times and prices may differ on other dates; taking the latest one keeps the
|
* Group travel dates are left out: their pickups are arranged per group and
|
||||||
* values unique and shows them for as long as the product is offered.
|
* are not offered publicly. Pickups, times and prices may differ on other
|
||||||
|
* dates; taking the latest one keeps the values unique and shows them for as
|
||||||
|
* long as the product is offered.
|
||||||
*
|
*
|
||||||
* The returned shape is meant to be served by MyE&P later on, so that only the
|
* The returned shape is meant to be served by MyE&P later on, so that only the
|
||||||
* data source has to change once the local date table goes away.
|
* data source has to change once the local date table goes away.
|
||||||
|
|||||||
+1
@@ -403,6 +403,7 @@ return [
|
|||||||
'label' => 'Produkte',
|
'label' => 'Produkte',
|
||||||
'config' => [
|
'config' => [
|
||||||
'type' => 'select',
|
'type' => 'select',
|
||||||
|
'default' => 0,
|
||||||
'renderType' => 'selectMultipleSideBySide',
|
'renderType' => 'selectMultipleSideBySide',
|
||||||
'foreign_table' => 'tx_epproducts_domain_model_product',
|
'foreign_table' => 'tx_epproducts_domain_model_product',
|
||||||
'size' => 10,
|
'size' => 10,
|
||||||
|
|||||||
+10
-2
@@ -24,8 +24,8 @@ return [
|
|||||||
],
|
],
|
||||||
'types' => [
|
'types' => [
|
||||||
'1' => ['showitem' => 'hidden, bus_pro_id, hotel_bus_pro_id, code, daytrip, date_start, date_end, nights, board,
|
'1' => ['showitem' => 'hidden, bus_pro_id, hotel_bus_pro_id, code, daytrip, date_start, date_end, nights, board,
|
||||||
board_code, board_bus_pro_id, bus_included, bus_available, skipass_included, services_included,
|
board_code, board_bus_pro_id, bus_included, bus_available, skipass_included, group_travel,
|
||||||
services_general, courses_included, guide, pickups, discount, min_price, pseudo_price, available, min_pax,
|
services_included, services_general, courses_included, guide, pickups, discount, min_price, pseudo_price, available, min_pax,
|
||||||
new'
|
new'
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
@@ -322,6 +322,14 @@ return [
|
|||||||
'default' => 0
|
'default' => 0
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
|
'group_travel' => [
|
||||||
|
'exclude' => false,
|
||||||
|
'label' => 'Gruppenreise',
|
||||||
|
'config' => [
|
||||||
|
'type' => 'check',
|
||||||
|
'default' => 0
|
||||||
|
]
|
||||||
|
],
|
||||||
'bus_price' => [
|
'bus_price' => [
|
||||||
'exclude' => false,
|
'exclude' => false,
|
||||||
'label' => 'Bus Preis',
|
'label' => 'Bus Preis',
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ productImportSftpHostKey =
|
|||||||
# cat=SftpImport; type=int+; label=SFTP connection timeout in seconds
|
# cat=SftpImport; type=int+; label=SFTP connection timeout in seconds
|
||||||
productImportSftpTimeout = 15
|
productImportSftpTimeout = 15
|
||||||
|
|
||||||
# cat=ContentFeed; type=string; label=API key for the CMS backchannel endpoints (chatbot content feed, CMS index); sent as X-Api-Key. Empty denies every request.
|
# cat=ContentFeed; type=string; label=API key for the CMS backchannel endpoints used by MyE&P (/api/hotel, /api/product, /api/content/*); sent as X-Api-Key or ?key=. Empty denies every request.
|
||||||
cmsApiKey =
|
cmsApiKey =
|
||||||
|
|
||||||
# cat=ContentFeed; type=boolean; label=Serve the chatbot content feed (off: all feed endpoints answer 503)
|
# cat=ContentFeed; type=boolean; label=Serve the chatbot content feed (off: all feed endpoints answer 503)
|
||||||
|
|||||||
@@ -117,6 +117,7 @@ CREATE TABLE tx_epproducts_domain_model_date
|
|||||||
bus_included tinyint(1) unsigned DEFAULT '0' NOT NULL,
|
bus_included tinyint(1) unsigned DEFAULT '0' NOT NULL,
|
||||||
bus_available tinyint(1) unsigned DEFAULT '0' NOT NULL,
|
bus_available tinyint(1) unsigned DEFAULT '0' NOT NULL,
|
||||||
skipass_included tinyint(1) unsigned DEFAULT '0' NOT NULL,
|
skipass_included tinyint(1) unsigned DEFAULT '0' NOT NULL,
|
||||||
|
group_travel tinyint(1) unsigned DEFAULT '0' NOT NULL,
|
||||||
bus_price decimal(10,2) DEFAULT '0.00' NOT NULL,
|
bus_price decimal(10,2) DEFAULT '0.00' NOT NULL,
|
||||||
services_included text NOT NULL,
|
services_included text NOT NULL,
|
||||||
services_general text NOT NULL,
|
services_general text NOT NULL,
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ call_user_func(function() {
|
|||||||
'label' => 'Land',
|
'label' => 'Land',
|
||||||
'config' => [
|
'config' => [
|
||||||
'type' => 'select',
|
'type' => 'select',
|
||||||
|
'default' => 0,
|
||||||
'renderType' => 'selectSingle',
|
'renderType' => 'selectSingle',
|
||||||
'foreign_table' => 'tx_epproducts_domain_model_country',
|
'foreign_table' => 'tx_epproducts_domain_model_country',
|
||||||
'foreign_table_where' => 'ORDER BY name',
|
'foreign_table_where' => 'ORDER BY name',
|
||||||
@@ -39,6 +40,7 @@ call_user_func(function() {
|
|||||||
'label' => 'Gebiet',
|
'label' => 'Gebiet',
|
||||||
'config' => [
|
'config' => [
|
||||||
'type' => 'select',
|
'type' => 'select',
|
||||||
|
'default' => 0,
|
||||||
'renderType' => 'selectSingle',
|
'renderType' => 'selectSingle',
|
||||||
'foreign_table' => 'tx_epproducts_domain_model_region',
|
'foreign_table' => 'tx_epproducts_domain_model_region',
|
||||||
'foreign_table_where' => 'ORDER BY name',
|
'foreign_table_where' => 'ORDER BY name',
|
||||||
@@ -106,6 +108,7 @@ call_user_func(function() {
|
|||||||
'label' => 'Badge',
|
'label' => 'Badge',
|
||||||
'config' => [
|
'config' => [
|
||||||
'type' => 'select',
|
'type' => 'select',
|
||||||
|
'default' => 0,
|
||||||
'renderType' => 'selectSingle',
|
'renderType' => 'selectSingle',
|
||||||
'foreign_table' => 'tx_epproducts_domain_model_badge',
|
'foreign_table' => 'tx_epproducts_domain_model_badge',
|
||||||
'foreign_table_where' => 'ORDER BY title',
|
'foreign_table_where' => 'ORDER BY title',
|
||||||
|
|||||||
+1
@@ -22,6 +22,7 @@ call_user_func(function() {
|
|||||||
'label' => 'Mitarbeiter',
|
'label' => 'Mitarbeiter',
|
||||||
'config' => [
|
'config' => [
|
||||||
'type' => 'select',
|
'type' => 'select',
|
||||||
|
'default' => 0,
|
||||||
'renderType' => 'selectSingle',
|
'renderType' => 'selectSingle',
|
||||||
'foreign_table' => 'tx_epproducts_domain_model_teammember',
|
'foreign_table' => 'tx_epproducts_domain_model_teammember',
|
||||||
'foreign_table_where' => 'ORDER BY name',
|
'foreign_table_where' => 'ORDER BY name',
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<f:render partial="Disrupter/Outlines" section="Top1" arguments="{classes: '-translate-y-2 text-white'}"/>
|
<f:render partial="Disrupter/Outlines" section="Top1" arguments="{classes: '-translate-y-2 text-white'}"/>
|
||||||
</f:if>
|
</f:if>
|
||||||
<div class="py-4 relative">
|
<div class="py-4 relative">
|
||||||
<div class="container grid grid-cols-2 lg:grid-cols-4 gap-8 pb-4">
|
<div class="container grid md:grid-cols-2 lg:grid-cols-4 gap-8 pb-4 text-center md:text-left">
|
||||||
<f:if condition="{settings.footerNavPid}">
|
<f:if condition="{settings.footerNavPid}">
|
||||||
<f:for each="{footernav}" as="menuheader">
|
<f:for each="{footernav}" as="menuheader">
|
||||||
<div>
|
<div>
|
||||||
@@ -32,7 +32,7 @@
|
|||||||
</f:if>
|
</f:if>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="container py-4 text-white text-xl border-t border-white">
|
<div class="container py-4 text-white text-xl border-t border-white text-center md:text-left">
|
||||||
{totalRatings.totalAverage -> f:format.number(decimalSeparator: ',')} Sterne bei {totalRatings.totalCount} Bewertungen
|
{totalRatings.totalAverage -> f:format.number(decimalSeparator: ',')} Sterne bei {totalRatings.totalCount} Bewertungen
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -184,10 +184,8 @@
|
|||||||
<f:format.raw>{totalRatings.jsonData->f:format.json()}</f:format.raw>
|
<f:format.raw>{totalRatings.jsonData->f:format.json()}</f:format.raw>
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<f:comment><!--
|
<f:if condition="{site.identifier} == 'ep-reisen'">
|
||||||
<f:if condition="{site.identifier} == 'ep-reisen'">
|
<f:render partial="Chatbot" arguments="{_all}"/>
|
||||||
<f:render partial="Chatbot" arguments="{_all}"/>
|
</f:if>
|
||||||
</f:if>
|
|
||||||
--></f:comment>
|
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
xmlns="http://www.w3.org/1999/xhtml"
|
xmlns="http://www.w3.org/1999/xhtml"
|
||||||
xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
|
xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
|
||||||
|
|
||||||
<div class="odd:bg-zinc-50 p-4" data-rte-content>
|
<div class="group odd:bg-zinc-50 p-4" data-rte-content>
|
||||||
<f:if condition="{journey.byBus}">
|
<f:if condition="{journey.byBus}">
|
||||||
<h3>
|
<h3>
|
||||||
Busanreise
|
Busanreise
|
||||||
@@ -11,6 +11,9 @@
|
|||||||
{journey.byBus -> f:format.html()}
|
{journey.byBus -> f:format.html()}
|
||||||
</div>
|
</div>
|
||||||
</f:if>
|
</f:if>
|
||||||
|
<f:if condition="{pickupsOverview.pickups}">
|
||||||
|
<f:render partial="Product/Pickups" arguments="{pickupsOverview: pickupsOverview}"/>
|
||||||
|
</f:if>
|
||||||
<f:if condition="{journey.byCar}">
|
<f:if condition="{journey.byCar}">
|
||||||
<h3>
|
<h3>
|
||||||
Eigenanreise
|
Eigenanreise
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
xmlns="http://www.w3.org/1999/xhtml"
|
xmlns="http://www.w3.org/1999/xhtml"
|
||||||
xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
|
xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
|
||||||
|
|
||||||
<div class="group odd:bg-zinc-50 p-4" data-rte-content>
|
<div class="pb-8">
|
||||||
<h3>
|
<h3>
|
||||||
Bus-Zustiege
|
Bus-Zustiege
|
||||||
</h3>
|
</h3>
|
||||||
|
|||||||
@@ -162,12 +162,7 @@
|
|||||||
<div class="mb-4 hidden"
|
<div class="mb-4 hidden"
|
||||||
data-tabs-target="tab"
|
data-tabs-target="tab"
|
||||||
data-tab="journey">
|
data-tab="journey">
|
||||||
<f:if condition="{product.journey}">
|
<f:render partial="Journey/Details" arguments="{journey: product.journey, pickupsOverview: pickupsOverview, bars: 1}"/>
|
||||||
<f:render partial="Journey/Details" arguments="{journey: product.journey, bars: 1}"/>
|
|
||||||
</f:if>
|
|
||||||
<f:if condition="{pickupsOverview.pickups}">
|
|
||||||
<f:render partial="Product/Pickups" arguments="{pickupsOverview: pickupsOverview}"/>
|
|
||||||
</f:if>
|
|
||||||
</div>
|
</div>
|
||||||
</f:if>
|
</f:if>
|
||||||
</f:section>
|
</f:section>
|
||||||
|
|||||||
Reference in new issue
Block a user