Merge pull request #5588 from HSLdevcom/fix-schedules

vesameskanen · web-flow · commit 5ae9d8069286 · 2025-12-02T13:30:56.000+02:00
Fix schedule page redirect
diff --git a/app/component/routepage/ScheduleContainer.js b/app/component/routepage/ScheduleContainer.js
@@ -824,7 +824,10 @@ class ScheduleContainer extends PureComponent {
           !DateTime.now().hasSame(firstDepartureDate, 'day')
         ) {
           this.redirectWithServiceDay(firstDepartureDate);
-        } else {
+        } else if (
+          !firstDepartureDate ||
+          !DateTime.now().hasSame(firstDepartureDate, 'week')
+        ) {
           this.redirectWithServiceDay(nextMonday);
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -824,7 +824,10 @@ class ScheduleContainer extends PureComponent {`
`824`	`824`	`!DateTime.now().hasSame(firstDepartureDate, 'day')`
`825`	`825`	`) {`
`826`	`826`	`this.redirectWithServiceDay(firstDepartureDate);`
`827`		`- } else {`
	`827`	`+ } else if (`
	`828`	`+ !firstDepartureDate \|\|`
	`829`	`+ !DateTime.now().hasSame(firstDepartureDate, 'week')`
	`830`	`+ ) {`
`828`	`831`	`this.redirectWithServiceDay(nextMonday);`
`829`	`832`	`}`
`830`	`833`	`}`