fix ends_at was not being used

akiyamaSM · Feb 3, 2022 · fbbec30 · fbbec30
1 parent bb83dce
commit fbbec30
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git a/src/Helpers/PollWriter.php b/src/Helpers/PollWriter.php
@@ -35,7 +35,7 @@ public function draw($poll)
 
         $voter = $poll->canGuestVote() ? new Guest(request()) : auth(config('larapoll_config.admin_guard'))->user();
 
-        if (is_null($voter) || $voter->hasVoted($poll->id) || $poll->isLocked()) {
+        if (is_null($voter) || $voter->hasVoted($poll->id) || $poll->isLocked() || $poll->hasEnded()) {
             if (!$poll->showResultsEnabled()) {
                 return 'Thanks for voting';
             }

diff --git a/src/Http/Controllers/PollManagerController.php b/src/Http/Controllers/PollManagerController.php
@@ -31,6 +31,7 @@ public function index()
             $poll->isComingSoon = $poll->isComingSoon();
             $poll->isLocked = $poll->isLocked();
             $poll->isRunning = $poll->isRunning();
+            $poll->hasEnded = $poll->hasEnded();
             $poll->edit_link = route('poll.edit', $poll->id);
             $poll->delete_link = route('poll.remove', $poll->id);
             $poll->lock_link = route('poll.lock', $poll->id);
@@ -124,6 +125,7 @@ public function lock(Poll $poll)
         $poll->isComingSoon = $poll->isComingSoon();
         $poll->isLocked = $poll->isLocked();
         $poll->isRunning = $poll->isRunning();
+        $poll->hasEnded = $poll->hasEnded();
         $poll->edit_link = route('poll.edit', $poll->id);
         $poll->delete_link = route('poll.remove', $poll->id);
 

diff --git a/src/Http/Controllers/VoteManagerController.php b/src/Http/Controllers/VoteManagerController.php
@@ -19,9 +19,7 @@ class VoteManagerController extends Controller
      */
     public function vote(Poll $poll, Request $request)
     {
-
         try{
-
             $vote = $this->resolveVoter($request, $poll)
                 ->poll($poll)
                 ->vote($request->get('options'));

diff --git a/src/Traits/PollAccessor.php b/src/Traits/PollAccessor.php
@@ -1,7 +1,6 @@
 <?php
 namespace Inani\Larapoll\Traits;
 
-
 trait PollAccessor
 {
 
@@ -82,7 +81,7 @@ public function isOpen()
      */
     public function isRunning()
     {
-        return $this->isOpen() && $this->hasStarted();
+        return $this->isOpen() && $this->hasStarted() && !$this->hasEnded();
     }
 
     /**
@@ -104,4 +103,14 @@ public function isComingSoon()
     {
         return $this->isOpen() && now() < $this->starts_at;
     }
+
+    /**
+     * If the poll has already ended
+     *
+     * @return bool
+     */
+    public function hasEnded()
+    {
+        return $this->ends_at < now();
+    }
 }
diff --git a/src/Traits/Voter.php b/src/Traits/Voter.php
@@ -46,7 +46,7 @@ public function vote($options)
         if (is_null($this->poll))
             throw new PollNotSelectedToVoteException();
 
-        if ($this->poll->isLocked())
+        if ($this->poll->isLocked() || $this->poll->hasEnded())
             throw new VoteInClosedPollException();
 
         if ($this->hasVoted($this->poll->id))

diff --git a/src/views/dashboard/index.blade.php b/src/views/dashboard/index.blade.php
@@ -8,7 +8,6 @@
     <!--Responsive Extension Datatables CSS-->
     <link href="https://cdn.datatables.net/responsive/2.2.3/css/responsive.dataTables.min.css" rel="stylesheet">
 
-
     <style>
 
         /*Overrides for Tailwind CSS */
@@ -113,6 +112,7 @@
                         <span v-if="poll.isLocked" class="label label-danger">Closed</span>
                         <span v-else-if="poll.isComingSoon" class="label label-info">Soon</span>
                         <span v-else-if="poll.isRunning" class="label label-success">Started</span>
+                        <span v-else-if="poll.hasEnded" class="label label-success">Ended</span>
                     </td>
                     <td>
                         <a class="btn btn-info btn-sm" :href="poll.edit_link">