diff --git a/app/Http/Controllers/Backend/ReportController.php b/app/Http/Controllers/Backend/ReportController.php index a44ac81..c3e9b0f 100644 --- a/app/Http/Controllers/Backend/ReportController.php +++ b/app/Http/Controllers/Backend/ReportController.php @@ -650,29 +650,29 @@ class ReportController extends Controller $forms = [ 'Up Country' => FormUpCountry::whereIn('user_id', $userIds) ->whereBetween('tanggal', [$startDate, $endDate]) - ->whereIn('status', ['Approved', 'On Progress']) + ->whereIn('status', ['Approved', 'Closed']) ->get(), 'Vehicle Running Cost' => FormVehicleRunningCost::whereIn('user_id', $userIds) ->whereBetween('tanggal', [$startDate, $endDate]) - ->whereIn('status', ['Approved', 'On Progress']) + ->whereIn('status', ['Approved', 'Closed']) ->get(), 'Entertainment' => FormEntertaimentPresentation::whereIn('user_id', $userIds) ->whereBetween('tanggal', [$startDate, $endDate]) - ->whereIn('status', ['Approved', 'On Progress']) + ->whereIn('status', ['Approved', 'Closed']) ->get(), 'Meeting / Seminar' => FormMeetingSeminar::whereIn('user_id', $userIds) ->whereBetween('created_at', [$startDate, $endDate]) - ->whereIn('status', ['Approved', 'On Progress']) + ->whereIn('status', ['Approved', 'Closed']) ->get(), ]; // Forms "Others" dikelompokkan berdasarkan kategori $otherForms = FormOthers::whereIn('user_id', $userIds) ->whereBetween('tanggal', [$startDate, $endDate]) - ->whereIn('status', ['Approved', 'On Progress']) + ->whereIn('status', ['Approved', 'Closed']) ->get(); // Total nominal per kategori