diff --git a/internal/service/week_service.go b/internal/service/week_service.go index f94d288..e783262 100644 --- a/internal/service/week_service.go +++ b/internal/service/week_service.go @@ -94,9 +94,10 @@ func (s *WeekService) CloseWeek(ctx context.Context, weekKey string) (*domain.Cl return nil, err } - // Get settings at the start of the week (Monday) - mondayKey := dayKeys[0] - set, err := s.settings.Current(ctx, mondayKey) + // Get settings effective at close time (today), not necessarily at the + // start of the week. This ensures settings changes made mid-week are + // reflected when the week is closed. + set, err := s.settings.Current(ctx, time.Now().In(s.tz).Format("2006-01-02")) if err != nil { return nil, ErrNoSettings }