diff --git a/backend/handlers/bookings/manage.go b/backend/handlers/bookings/manage.go index df3d5d4..91774dd 100644 --- a/backend/handlers/bookings/manage.go +++ b/backend/handlers/bookings/manage.go @@ -1957,6 +1957,12 @@ func AdminApproveEditRequestHandler(w http.ResponseWriter, r *http.Request) { http.Error(w, "Cannot approve: the proposed time falls during a period when the salon is closed", http.StatusConflict) return } + + // Also check the day isn't closed under a staged default hours change + if closeStr, err := getClosingTimeForDate(r.Context(), tx, weekday, localStart); err == nil && (closeStr == "00:00" || closeStr == "00:00:00") { + http.Error(w, "This day will be closed under the upcoming schedule change", http.StatusConflict) + return + } } // Build update query for bookings table