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

feat: sort pickups by date and time on import

Browse Source
This commit is contained in:
Björn Fromme
2024-10-30 15:23:15 +01:00
parent 4678f095a8
commit 17f7eca123
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_products/Classes/Service/DateImportService.php
+12 -6
View File
@@ -461,21 +461,27 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
$timestamp = (string) $attributes['zeit']; $timestamp = (string) $attributes['zeit'];
$parts = explode(' ', $timestamp); $parts = explode(' ', $timestamp);
if (2 === count($parts)) { if (2 === count($parts)) {
[$datePart, $timePart] = $parts; [$pickupDate, $timePart] = $parts;
$pickupTime = substr($timePart, 0, 5);
} else { } else {
$datePart = null; $pickupDate = $dateStart->format('d.m.Y');
[$timePart, ] = $parts; $pickupTime = $parts[0];
} }
$pickupTime = sprintf('%s Uhr', substr($timePart, 0, 5));
$pickupDate = $datePart;
$pickups[] = [ $pickups[] = [
'bus_pro_id' => $busProId,
'city' => $this->pickups[$busProId]['city'], 'city' => $this->pickups[$busProId]['city'],
'street' => $this->pickups[$busProId]['street'], 'street' => $this->pickups[$busProId]['street'],
'price' => (float) str_replace(',', '.', (string) $attributes['preis']), 'price' => (float) str_replace(',', '.', (string) $attributes['preis']),
'time' => $pickupTime,
'date' => $pickupDate, 'date' => $pickupDate,
'time' => $pickupTime,
]; ];
} }
usort($pickups, function ($a, $b) {
$timeStampA = \DateTimeImmutable::createFromFormat('d.m.Y H:i', $a['date'].' '.$a['time']);
$timeStampB = \DateTimeImmutable::createFromFormat('d.m.Y H:i', $b['date'].' '.$b['time']);
return $timeStampA <=> $timeStampB;
});
$date['pickups'] = serialize($pickups); $date['pickups'] = serialize($pickups);
return $date; return $date;