Fix end repeat date time

DestinationCore · May 23, 2022 · 630e29b · 630e29b
1 parent 6f65d16
commit 630e29b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## 1.4.1 - 23-05-22
+### Fixed
+- `endRepeatDate` `DateTime` object time manually set to end of day (23:59:59).
+
 ## 1.4.0 - 29-04-22
 ### Added
 - Version number to `composer.json`.

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "unionco/calendarize",
     "description": "A calendar field type providing functionality for recurrence.",
-    "version": "1.4.0",
+    "version": "1.4.1",
     "type": "craft-plugin",
     "keywords": [
         "craft",

diff --git a/src/services/CalendarizeService.php b/src/services/CalendarizeService.php
@@ -394,8 +394,6 @@ public function modifyElementsQuery(CalendarizeField $field, ElementQueryInterfa
      */
     public function saveField(CalendarizeField $field, ElementInterface $owner): bool
     {
-        /** @var Element $owner */
-        $locale = $owner->getSite()->language;
         /** @var Map $value */
         $value = $owner->getFieldValue($field->handle);
 
@@ -427,7 +425,13 @@ public function saveField(CalendarizeField $field, ElementInterface $owner): boo
             $record->months         = $value->months ?? null;
 
             if (isset($value->endRepeatDate)) {
-                $record->endRepeatDate = Db::prepareDateForDb($value->endRepeatDate);
+                $endRepeat = $value->endRepeatDate;
+
+                if ($endRepeat instanceof DateTime) {
+                    $endRepeat->setTime(23, 59, 59);
+                }
+
+                $record->endRepeatDate = Db::prepareDateForDb($endRepeat);
             }
 
             if (isset($value->exceptions)) {