From deeb8c7a68cee441910c8f0029ebad992ef70183 Mon Sep 17 00:00:00 2001 From: Jagad R R Date: Sun, 12 Jan 2025 13:37:29 +0700 Subject: [PATCH] fix --- app/Helpers/BudgetHelper.php | 2 +- .../Backend/DashboardController.php | 35 ++++++++++++++++--- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/app/Helpers/BudgetHelper.php b/app/Helpers/BudgetHelper.php index 7fd708d..99f4ae8 100644 --- a/app/Helpers/BudgetHelper.php +++ b/app/Helpers/BudgetHelper.php @@ -31,7 +31,7 @@ class BudgetHelper // Add the used budget per model for the specified month and year to the usedBudget array $users = UserHasCabang::where('cabang_id', $cabang_id)->get(); - $userIds = $users->pluck('user_id')->toArray(); + $userIds = $users->pluck('user_id')->toArray(); $forms = FormHelper::getFormsByUserIds($userIds, $month, $year)->sortByDesc('tanggal')->sortByDesc('created_at'); $usedBudget += $forms->sum('approved_total'); } diff --git a/app/Http/Controllers/Backend/DashboardController.php b/app/Http/Controllers/Backend/DashboardController.php index d04504e..eaa10f4 100644 --- a/app/Http/Controllers/Backend/DashboardController.php +++ b/app/Http/Controllers/Backend/DashboardController.php @@ -22,11 +22,36 @@ class DashboardController extends Controller { $role = auth()->user()->getRoleNames()[0]; $forms = [ - 'vehicle' => FormVehicleRunningCost::query(), - 'upcountry' => FormUpCountry::query(), - 'entertainment' => FormEntertaimentPresentation::query(), - 'meeting' => FormMeetingSeminar::query(), - 'others' => FormOthers::query(), + 'vehicle' => FormVehicleRunningCost::whereMonth('tanggal', date('m')) + ->whereYear('tanggal', date('Y')) + ->where('tanggal', '<=', date('Y-m-10')) + ->whereRaw('DAY(CURDATE()) <= 10') + ->orderBy('tanggal', 'desc') + ->get(), + 'upcountry' => FormUpCountry::whereMonth('tanggal', date('m')) + ->whereYear('tanggal', date('Y')) + ->where('tanggal', '<=', date('Y-m-10')) + ->whereRaw('DAY(CURDATE()) <= 10') + ->orderBy('tanggal', 'desc') + ->get(), + 'entertainment' => FormEntertaimentPresentation::whereMonth('tanggal', date('m')) + ->whereYear('tanggal', date('Y')) + ->where('tanggal', '<=', date('Y-m-10')) + ->whereRaw('DAY(CURDATE()) <= 10') + ->orderBy('tanggal', 'desc') + ->get(), + 'meeting' => FormMeetingSeminar::whereMonth('created_at', date('m')) + ->whereYear('created_at', date('Y')) + ->where('created_at', '<=', date('Y-m-10')) + ->whereRaw('DAY(CURDATE()) <= 10') + ->orderBy('created_at', 'desc') + ->get(), + 'others' => FormOthers::whereMonth('tanggal', date('m')) + ->whereYear('tanggal', date('Y')) + ->where('tanggal', '<=', date('Y-m-10')) + ->whereRaw('DAY(CURDATE()) <= 10') + ->orderBy('tanggal', 'desc') + ->get(), ]; if ($role == 'Admin Region' || $role == 'Marketing Operational Manager Region') {