diff --git a/app/Http/Controllers/UrlShortenerController.php b/app/Http/Controllers/UrlShortenerController.php index 0f4982a..d0480b6 100755 --- a/app/Http/Controllers/UrlShortenerController.php +++ b/app/Http/Controllers/UrlShortenerController.php @@ -104,9 +104,11 @@ class UrlShortenerController extends Controller $urlExpired = false; if ($urlAddress['date_expired'] != null) { - $today = Carbon::now(); + $today = Carbon::now()->setTime(0, 0, 0); $urlExpiredDate = Carbon::parse($urlAddress['date_expired']); - $urlExpired = $urlExpiredDate->lessThan($today); + if (!$today->equalTo($urlExpiredDate)) { + $urlExpired = $urlExpiredDate->lessThanOrEqualTo($today); + } } if (!$urlExpired) { diff --git a/resources/views/list.blade.php b/resources/views/list.blade.php index dc3b184..3380b4e 100755 --- a/resources/views/list.blade.php +++ b/resources/views/list.blade.php @@ -59,6 +59,17 @@ + + 1. + http://www.google.com + http://shorturl.test/s/fffs + 5 + + + + + +