This commit is contained in:
Jagad R R
2025-06-26 19:47:57 +07:00
parent a286e4c28a
commit c052d8508b
7 changed files with 93 additions and 6 deletions
@@ -52,7 +52,7 @@ class FormEntertainmentPresentationController extends Controller
}
// Calculate the actual start date for data retrieval (1 month before currentPeriodStartDate)
$dataRetrievalStartDate = $currentPeriodStartDate->copy()->subMonth()->startOfDay();
$dataRetrievalStartDate = $currentPeriodStartDate->copy()->subMonth()->subDay()->startOfDay();
$forms = FormEntertaimentPresentation::whereBetween('tanggal', [$dataRetrievalStartDate, $currentPeriodClosingDate])
->orderBy('tanggal', 'desc')
@@ -53,7 +53,7 @@ class FormMeetingSeminarController extends Controller
}
// Calculate the actual start date for data retrieval (1 month before currentPeriodStartDate)
$dataRetrievalStartDate = $currentPeriodStartDate->copy()->subMonth()->startOfDay();
$dataRetrievalStartDate = $currentPeriodStartDate->copy()->subMonth()->subDay()->startOfDay();
$forms = FormMeetingSeminar::whereBetween('tanggal', [$dataRetrievalStartDate, $currentPeriodClosingDate])
->orderBy('tanggal', 'desc')
@@ -50,7 +50,7 @@ class FormOtherController extends Controller
}
// Calculate the actual start date for data retrieval (1 month before currentPeriodStartDate)
$dataRetrievalStartDate = $currentPeriodStartDate->copy()->subMonth()->startOfDay();
$dataRetrievalStartDate = $currentPeriodStartDate->copy()->subMonth()->subDay()->startOfDay();
$forms = FormOthers::whereBetween('tanggal', [$dataRetrievalStartDate, $currentPeriodClosingDate])
->orderBy('tanggal', 'desc')
@@ -53,7 +53,7 @@ class FormUpCountryController extends Controller
}
// Calculate the actual start date for data retrieval (1 month before currentPeriodStartDate)
$dataRetrievalStartDate = $currentPeriodStartDate->copy()->subMonth()->startOfDay();
$dataRetrievalStartDate = $currentPeriodStartDate->copy()->subMonth()->subDay()->startOfDay();
$forms = FormUpCountry::whereBetween('tanggal', [$dataRetrievalStartDate, $currentPeriodClosingDate])
->orderBy('tanggal', 'desc')
@@ -53,7 +53,7 @@ class FormVehicleController extends Controller
}
// Calculate the actual start date for data retrieval (1 month before currentPeriodStartDate)
$dataRetrievalStartDate = $currentPeriodStartDate->copy()->subMonth()->startOfDay();
$dataRetrievalStartDate = $currentPeriodStartDate->copy()->subMonth()->subDay()->startOfDay();
$forms = FormVehicleRunningCost::whereBetween('tanggal', [$dataRetrievalStartDate, $currentPeriodClosingDate])
->orderBy('tanggal', 'desc')