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-05-26 19:42:30 +07:00
parent f0546fa86f
commit 7525909e9c
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Backend/BudgetControlController.php
+2 -2
View File
@@ -53,8 +53,8 @@ class BudgetControlController extends Controller
$startDate = Carbon::create($now->copy()->subMonth()->year, $now->copy()->subMonth()->month, $startDay)->startOfDay(); $startDate = Carbon::create($now->copy()->subMonth()->year, $now->copy()->subMonth()->month, $startDay)->startOfDay();
} }
$periodeMonth = $startDate->month; $periodeMonth = strtolower($startDate->format('F'));
$periodeYear = $startDate->year; $periodeYear = (int) $startDate->format('Y');
// Hitung available budget berdasarkan periode // Hitung available budget berdasarkan periode
$budget->map(function ($b) use ($periodeMonth, $periodeYear) { $budget->map(function ($b) use ($periodeMonth, $periodeYear) {
app/Http/Controllers/Forms/FormUpCountryController.php
+2 -4
View File
@@ -58,6 +58,8 @@ class FormUpCountryController extends Controller
->get(); ->get();
$availableBudget = null; $availableBudget = null;
$periodeMonth = strtolower($startDate->format('F'));
$periodeYear = (int) $startDate->format('Y');
if ($role == 'Admin Region' || $role == 'Marketing Operational Manager Region') { if ($role == 'Admin Region' || $role == 'Marketing Operational Manager Region') {
$region_id = auth()->user()->getMyCabangAndRegionId()['region']; $region_id = auth()->user()->getMyCabangAndRegionId()['region'];
@@ -79,8 +81,6 @@ class FormUpCountryController extends Controller
$userIds = $users->pluck('user_id')->toArray(); $userIds = $users->pluck('user_id')->toArray();
$forms = $forms->whereIn('user_id', $userIds); $forms = $forms->whereIn('user_id', $userIds);
$periodeMonth = $startDate->month;
$periodeYear = $startDate->year;
$availableBudget = BudgetHelper::getAvailableBudget($cabang_id, $periodeMonth, $periodeYear); $availableBudget = BudgetHelper::getAvailableBudget($cabang_id, $periodeMonth, $periodeYear);
} }
} }
@@ -88,8 +88,6 @@ class FormUpCountryController extends Controller
$forms = $forms->where('user_id', auth()->user()->id); $forms = $forms->where('user_id', auth()->user()->id);
$cabang_id = UserHasCabang::where('user_id', auth()->user()->id)->first()->cabang_id; $cabang_id = UserHasCabang::where('user_id', auth()->user()->id)->first()->cabang_id;
$periodeMonth = $startDate->month;
$periodeYear = $startDate->year;
$availableBudget = BudgetHelper::getAvailableBudget($cabang_id, $periodeMonth, $periodeYear); $availableBudget = BudgetHelper::getAvailableBudget($cabang_id, $periodeMonth, $periodeYear);
} }
else { else {