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

added form parking / toll

Browse Source
This commit is contained in:
Jagad R R
2025-06-19 19:39:20 +07:00
parent a7fd26d2e6
commit a286e4c28a
11 changed files with 264 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Forms/FormEntertainmentPresentationController.php
+10 -9
View File
@@ -42,25 +42,26 @@ class FormEntertainmentPresentationController extends Controller
$now = Carbon::now();
// Tentukan periode aktif (mulai dan tutup)
// Determine the period
if ($now->day >= $startDay) {
$startDate = Carbon::create($now->year, $now->month, $startDay)->startOfDay();
$closingDate = Carbon::create($now->copy()->addMonth()->year, $now->copy()->addMonth()->month, $closingDay)->endOfDay();
$currentPeriodStartDate = Carbon::create($now->year, $now->month, $startDay)->startOfDay();
$currentPeriodClosingDate = Carbon::create($now->copy()->addMonth()->year, $now->copy()->addMonth()->month, $closingDay)->endOfDay();
} else {
$startDate = Carbon::create($now->copy()->subMonth()->year, $now->copy()->subMonth()->month, $startDay)->startOfDay();
$closingDate = Carbon::create($now->year, $now->month, $closingDay)->endOfDay();
$currentPeriodStartDate = Carbon::create($now->copy()->subMonth()->year, $now->copy()->subMonth()->month, $startDay)->startOfDay();
$currentPeriodClosingDate = Carbon::create($now->year, $now->month, $closingDay)->endOfDay();
}
// Ambil nama bulan dan tahun dari $startDate untuk keperluan BudgetHelper
$periodeMonth = strtolower($startDate->format('F')); // ex: 'august'
$periodeYear = (int) $startDate->format('Y'); // ex: 2025
// Calculate the actual start date for data retrieval (1 month before currentPeriodStartDate)
$dataRetrievalStartDate = $currentPeriodStartDate->copy()->subMonth()->startOfDay();
$forms = FormEntertaimentPresentation::whereBetween('tanggal', [$startDate, $closingDate])
$forms = FormEntertaimentPresentation::whereBetween('tanggal', [$dataRetrievalStartDate, $currentPeriodClosingDate])
->orderBy('tanggal', 'desc')
->with('user')
->get();
$availableBudget = null;
$periodeMonth = strtolower($currentPeriodStartDate->format('F'));
$periodeYear = (int) $currentPeriodStartDate->format('Y');
if ($role == 'Admin Region' || $role == 'Marketing Operational Manager Region') {
$region_id = auth()->user()->getMyCabangAndRegionId()['region'];