Merge pull request #36 from maatien/dev

Fix bug related to timezone change
omnia-digital · Oct 18, 2024 · 07d9d01 · 07d9d01
2 parents 1bf9f42 + 944d13c
commit 07d9d01
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/LivewireCalendar.php b/src/LivewireCalendar.php
@@ -163,8 +163,8 @@ public function goToCurrentMonth()
 
     public function calculateGridStartsEnds()
     {
-        $this->gridStartsAt = $this->startsAt->clone()->startOfWeek($this->weekStartsAt);
-        $this->gridEndsAt = $this->endsAt->clone()->endOfWeek($this->weekEndsAt);
+        $this->gridStartsAt = $this->startsAt->clone()->startOfWeek($this->weekStartsAt)->shiftTimezone(config('app.timezone'));;
+        $this->gridEndsAt = $this->endsAt->clone()->endOfWeek($this->weekEndsAt)->shiftTimezone(config('app.timezone'));;
     }
 
     /**