diff --git a/app/Http/Controllers/Backend/BudgetControlController.php b/app/Http/Controllers/Backend/BudgetControlController.php index 45c36fc..ec1b469 100644 --- a/app/Http/Controllers/Backend/BudgetControlController.php +++ b/app/Http/Controllers/Backend/BudgetControlController.php @@ -53,8 +53,8 @@ class BudgetControlController extends Controller $startDate = Carbon::create($now->copy()->subMonth()->year, $now->copy()->subMonth()->month, $startDay)->startOfDay(); } - $periodeMonth = $startDate->month; - $periodeYear = $startDate->year; + $periodeMonth = strtolower($startDate->format('F')); + $periodeYear = (int) $startDate->format('Y'); // Hitung available budget berdasarkan periode $budget->map(function ($b) use ($periodeMonth, $periodeYear) { diff --git a/app/Http/Controllers/Forms/FormUpCountryController.php b/app/Http/Controllers/Forms/FormUpCountryController.php index b654e9e..7706353 100644 --- a/app/Http/Controllers/Forms/FormUpCountryController.php +++ b/app/Http/Controllers/Forms/FormUpCountryController.php @@ -58,6 +58,8 @@ class FormUpCountryController extends Controller ->get(); $availableBudget = null; + $periodeMonth = strtolower($startDate->format('F')); + $periodeYear = (int) $startDate->format('Y'); if ($role == 'Admin Region' || $role == 'Marketing Operational Manager Region') { $region_id = auth()->user()->getMyCabangAndRegionId()['region']; @@ -79,8 +81,6 @@ class FormUpCountryController extends Controller $userIds = $users->pluck('user_id')->toArray(); $forms = $forms->whereIn('user_id', $userIds); - $periodeMonth = $startDate->month; - $periodeYear = $startDate->year; $availableBudget = BudgetHelper::getAvailableBudget($cabang_id, $periodeMonth, $periodeYear); } } @@ -88,8 +88,6 @@ class FormUpCountryController extends Controller $forms = $forms->where('user_id', auth()->user()->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); } else {