From e1dc5dafe6bc7dfd047fafaf0c01b03be5e152fa Mon Sep 17 00:00:00 2001 From: Roardom Date: Thu, 31 Oct 2024 01:54:15 +0000 Subject: [PATCH] fix: claiming prize for last day of event --- app/Http/Controllers/ClaimedPrizeController.php | 4 +++- resources/views/partials/top_nav.blade.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/ClaimedPrizeController.php b/app/Http/Controllers/ClaimedPrizeController.php index 163bada7a..755f60a43 100644 --- a/app/Http/Controllers/ClaimedPrizeController.php +++ b/app/Http/Controllers/ClaimedPrizeController.php @@ -32,7 +32,9 @@ class ClaimedPrizeController extends Controller return back()->withErrors('Event is not active.'); } - if (!now()->isBetween($event->starts_at, $event->ends_at)) { + $isAvailable = now()->isBetween($event->starts_at->startOfDay(), $event->ends_at->endOfDay()); + + if (!$isAvailable) { return back()->withErrors('Prizes are not currently available.'); } diff --git a/resources/views/partials/top_nav.blade.php b/resources/views/partials/top_nav.blade.php index fe57a53ce..bfc231ffd 100755 --- a/resources/views/partials/top_nav.blade.php +++ b/resources/views/partials/top_nav.blade.php @@ -200,7 +200,7 @@
{{ __('common.other') }} - @if ($events->contains(fn ($event) => ! $event->claimed_prizes_exists && $event->ends_at->isFuture())) + @if ($events->contains(fn ($event) => ! $event->claimed_prizes_exists && $event->ends_at->endOfDay()->isFuture())) @endif