From 015798accd7c3eb74dc46a5aa71594fe1aa55a5b Mon Sep 17 00:00:00 2001 From: Tokumeikoi Date: Wed, 24 Jun 2020 14:26:43 +0800 Subject: [PATCH] update plan fetch --- app/Http/Controllers/Admin/PlanController.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Http/Controllers/Admin/PlanController.php b/app/Http/Controllers/Admin/PlanController.php index 92b53488..391f6591 100755 --- a/app/Http/Controllers/Admin/PlanController.php +++ b/app/Http/Controllers/Admin/PlanController.php @@ -22,6 +22,10 @@ class PlanController extends Controller DB::raw("count(*) as count") ) ->where('plan_id', '!=', NULL) + ->where(function ($query) { + $query->where('expired_at', '>=', time()) + ->orWhere('expired_at', NULL); + }) ->groupBy("plan_id") ->get(); $plans = Plan::orderBy('sort', 'ASC')->get();