use end time (fixes #27)

transformstudios · Mar 11, 2020 · 56152c3 · 56152c3
1 parent 0a02e76
commit 56152c3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Events/Types/SingleDayEvent.php b/Events/Types/SingleDayEvent.php
@@ -42,7 +42,13 @@ public function datesBetween($from, $to): Collection
         $start = $this->start();
 
         if ($start->between(carbon($from), carbon($to))) {
-            return collect([Schedule::fromCarbon($start)]);
+            $day = new Schedule([
+                'date' => $this->start_date,
+                'start_time' => $this->startTime(),
+                'end_time' => $this->endTime(),
+            ]);
+
+            return collect([$day]);
         }
 
         return collect([]);

diff --git a/Events/tests/SingleDayEventsTest.php b/Events/tests/SingleDayEventsTest.php
@@ -186,13 +186,15 @@ public function test_can_generate_between_dates()
 
         $dates = collect([
             carbon('2019-11-27 11:00'),
+            carbon('2019-11-27 12:00'),
         ]);
 
         $nextDates = $this->nonAllDayEvent->datesBetween(carbon('2019-11-26'), carbon('2019-11-28'));
 
         $this->assertCount(1, $nextDates);
 
         $this->assertEquals($dates[0], $nextDates[0]->start());
+        $this->assertEquals($dates[1], $nextDates[0]->end());
 
         $this->assertEmpty(
             $this->allDayEvent->datesBetween(carbon('2019-11-28'), carbon('2019-11-29'))