diff --git a/public/typo3conf/ext/ep_products/Classes/Domain/Repository/DateRepository.php b/public/typo3conf/ext/ep_products/Classes/Domain/Repository/DateRepository.php index 086b563a..c047213c 100644 --- a/public/typo3conf/ext/ep_products/Classes/Domain/Repository/DateRepository.php +++ b/public/typo3conf/ext/ep_products/Classes/Domain/Repository/DateRepository.php @@ -33,6 +33,7 @@ class DateRepository extends AbstractRepository ->where( $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.group_travel', $qb->createNamedParameter(0, Connection::PARAM_INT)), 'date.date_start >= NOW()' ) ->orderBy('date.date_start', 'DESC') diff --git a/public/typo3conf/ext/ep_products/Classes/Service/PickupOverviewService.php b/public/typo3conf/ext/ep_products/Classes/Service/PickupOverviewService.php index f1a4f608..f05d0070 100644 --- a/public/typo3conf/ext/ep_products/Classes/Service/PickupOverviewService.php +++ b/public/typo3conf/ext/ep_products/Classes/Service/PickupOverviewService.php @@ -7,10 +7,12 @@ use EP\EpProducts\Domain\Model\Product; use EP\EpProducts\Domain\Repository\DateRepository; /** - * Lists the pickup points of a product's latest upcoming date that has any, - * with that date's time and round-trip surcharge per pickup point. 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. + * Lists the pickup points of a product's latest upcoming end-customer date that + * has any, with that date's time and round-trip surcharge per pickup point. + * Group travel dates are left out: their pickups are arranged per group and + * 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 * data source has to change once the local date table goes away.