itdept/expense
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update ReportController.php

Browse Source
This commit is contained in:
Jagad R R
2025-05-05 23:19:22 +07:00
parent 35ad132607
commit 9a8cec7165
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Backend/ReportController.php
+5 -5
View File
@@ -650,29 +650,29 @@ class ReportController extends Controller
$forms = [ $forms = [
'Up Country' => FormUpCountry::whereIn('user_id', $userIds) 'Up Country' => FormUpCountry::whereIn('user_id', $userIds)
->whereBetween('tanggal', [$startDate, $endDate]) ->whereBetween('tanggal', [$startDate, $endDate])
->whereIn('status', ['Approved', 'On Progress']) ->whereIn('status', ['Approved', 'Closed'])
->get(), ->get(),
'Vehicle Running Cost' => FormVehicleRunningCost::whereIn('user_id', $userIds) 'Vehicle Running Cost' => FormVehicleRunningCost::whereIn('user_id', $userIds)
->whereBetween('tanggal', [$startDate, $endDate]) ->whereBetween('tanggal', [$startDate, $endDate])
->whereIn('status', ['Approved', 'On Progress']) ->whereIn('status', ['Approved', 'Closed'])
->get(), ->get(),
'Entertainment' => FormEntertaimentPresentation::whereIn('user_id', $userIds) 'Entertainment' => FormEntertaimentPresentation::whereIn('user_id', $userIds)
->whereBetween('tanggal', [$startDate, $endDate]) ->whereBetween('tanggal', [$startDate, $endDate])
->whereIn('status', ['Approved', 'On Progress']) ->whereIn('status', ['Approved', 'Closed'])
->get(), ->get(),
'Meeting / Seminar' => FormMeetingSeminar::whereIn('user_id', $userIds) 'Meeting / Seminar' => FormMeetingSeminar::whereIn('user_id', $userIds)
->whereBetween('created_at', [$startDate, $endDate]) ->whereBetween('created_at', [$startDate, $endDate])
->whereIn('status', ['Approved', 'On Progress']) ->whereIn('status', ['Approved', 'Closed'])
->get(), ->get(),
]; ];
// Forms "Others" dikelompokkan berdasarkan kategori // Forms "Others" dikelompokkan berdasarkan kategori
$otherForms = FormOthers::whereIn('user_id', $userIds) $otherForms = FormOthers::whereIn('user_id', $userIds)
->whereBetween('tanggal', [$startDate, $endDate]) ->whereBetween('tanggal', [$startDate, $endDate])
->whereIn('status', ['Approved', 'On Progress']) ->whereIn('status', ['Approved', 'Closed'])
->get(); ->get();
// Total nominal per kategori // Total nominal per kategori