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

fix

Browse Source
This commit is contained in:
Jagad R R
2025-01-12 13:37:29 +07:00
parent 6efaa99220
commit deeb8c7a68
2 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Helpers/BudgetHelper.php
+1 -1
View File
@@ -31,7 +31,7 @@ class BudgetHelper
// Add the used budget per model for the specified month and year to the usedBudget array // Add the used budget per model for the specified month and year to the usedBudget array
$users = UserHasCabang::where('cabang_id', $cabang_id)->get(); $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'); $forms = FormHelper::getFormsByUserIds($userIds, $month, $year)->sortByDesc('tanggal')->sortByDesc('created_at');
$usedBudget += $forms->sum('approved_total'); $usedBudget += $forms->sum('approved_total');
} }
app/Http/Controllers/Backend/DashboardController.php
+30 -5
View File
@@ -22,11 +22,36 @@ class DashboardController extends Controller
{ {
$role = auth()->user()->getRoleNames()[0]; $role = auth()->user()->getRoleNames()[0];
$forms = [ $forms = [
'vehicle' => FormVehicleRunningCost::query(), 'vehicle' => FormVehicleRunningCost::whereMonth('tanggal', date('m'))
'upcountry' => FormUpCountry::query(), ->whereYear('tanggal', date('Y'))
'entertainment' => FormEntertaimentPresentation::query(), ->where('tanggal', '<=', date('Y-m-10'))
'meeting' => FormMeetingSeminar::query(), ->whereRaw('DAY(CURDATE()) <= 10')
'others' => FormOthers::query(), ->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') { if ($role == 'Admin Region' || $role == 'Marketing Operational Manager Region') {