wip

app/Filament/Company/Pages/Reports/BaseReportPage.php

@@ -122,7 +122,7 @@ abstract class BaseReportPage extends Page
         if ($endDateField && ! $startDateField) {
             $this->setFilterState('dateRange', $this->getDefaultDateRange());
             $defaultEndDate = Carbon::parse($this->fiscalYearEndDate);
-            $this->setFilterState($endDateField, $defaultEndDate->isFuture() ? company_now()->endOfDay()->toDateTimeString() : $defaultEndDate->endOfDay()->toDateTimeString());
+            $this->setFilterState($endDateField, $defaultEndDate->isFuture() ? company_today()->toDateString() : $defaultEndDate->toDateString());
 
             return;
         }
@@ -176,8 +176,8 @@ abstract class BaseReportPage extends Page
 
     public function setDateRange(Carbon $start, Carbon $end): void
     {
-        $this->setFilterState('startDate', $start->startOfDay()->toDateTimeString());
-        $this->setFilterState('endDate', $end->isFuture() ? company_now()->endOfDay()->toDateTimeString() : $end->endOfDay()->toDateTimeString());
+        $this->setFilterState('startDate', $start->toDateString());
+        $this->setFilterState('endDate', $end->isFuture() ? company_today()->toDateString() : $end->toDateString());
     }
 
     public function getFormattedStartDate(): string

app/Filament/Forms/Components/DateRangeSelect.php

@@ -88,7 +88,7 @@ class DateRangeSelect extends Select
 
     public function processFiscalYear($year, Set $set): void
     {
-        $currentYear = company_now()->year;
+        $currentYear = company_today()->year;
         $diff = $currentYear - $year;
         $fiscalYearStart = Carbon::parse($this->fiscalYearStartDate)->subYears($diff);
         $fiscalYearEnd = Carbon::parse($this->fiscalYearEndDate)->subYears($diff);
@@ -97,7 +97,7 @@ class DateRangeSelect extends Select
 
     public function processFiscalQuarter($quarter, $year, Set $set): void
     {
-        $currentYear = company_now()->year;
+        $currentYear = company_today()->year;
         $diff = $currentYear - $year;
         $fiscalYearStart = Carbon::parse($this->fiscalYearStartDate)->subYears($diff);
         $quarterStart = $fiscalYearStart->copy()->addMonths(($quarter - 1) * 3);
@@ -130,11 +130,11 @@ class DateRangeSelect extends Select
     public function setDateRange(Carbon $start, Carbon $end, Set $set): void
     {
         if ($this->startDateField) {
-            $set($this->startDateField, $start->startOfDay()->toDateTimeString());
+            $set($this->startDateField, $start->toDateString());
         }
 
         if ($this->endDateField) {
-            $set($this->endDateField, $end->isFuture() ? company_now()->endOfDay()->toDateTimeString() : $end->endOfDay()->toDateTimeString());
+            $set($this->endDateField, $end->isFuture() ? company_today()->toDateString() : $end->toDateString());
         }
     }
 }

app/Services/DateRangeService.php

@@ -29,7 +29,8 @@ class DateRangeService
     private function generateDateRangeOptions(): array
     {
         $earliestDate = Carbon::parse(Accounting::getEarliestTransactionDate());
-        $currentDate = now();
+        $currentDate = company_today();
+        $currentYear = $currentDate->year;
         $fiscalYearStartCurrent = Carbon::parse($this->fiscalYearStartDate);
 
         $options = [
@@ -46,7 +47,7 @@ class DateRangeService
         foreach ($period as $date) {
             $options['Fiscal Year']['FY-' . $date->year] = $date->year;
 
-            $fiscalYearStart = $fiscalYearStartCurrent->copy()->subYears($currentDate->year - $date->year);
+            $fiscalYearStart = $fiscalYearStartCurrent->copy()->subYears($currentYear - $date->year);
 
             for ($i = 0; $i < 4; $i++) {
                 $quarterNumber = $i + 1;
@@ -86,7 +87,7 @@ class DateRangeService
                     continue;
                 }
 
-                $expectedEnd = $expectedEnd->isFuture() ? now()->startOfDay() : $expectedEnd;
+                $expectedEnd = $expectedEnd->isFuture() ? company_today() : $expectedEnd;
 
                 if ($startDate->eq($expectedStart) && $endDate->eq($expectedEnd)) {
                     return $key; // Return the matching range key (e.g., "FY-2024")
@@ -99,17 +100,19 @@ class DateRangeService
 
     private function getExpectedDateRange(string $type, string $key): array
     {
+        $currentYear = company_today()->year;
+
         switch ($type) {
             case 'Fiscal Year':
                 $year = (int) substr($key, 3);
-                $start = Carbon::parse($this->fiscalYearStartDate)->subYears(now()->year - $year)->startOfDay();
-                $end = Carbon::parse($this->fiscalYearEndDate)->subYears(now()->year - $year)->startOfDay();
+                $start = Carbon::parse($this->fiscalYearStartDate)->subYears($currentYear - $year)->startOfDay();
+                $end = Carbon::parse($this->fiscalYearEndDate)->subYears($currentYear - $year)->startOfDay();
 
                 break;
 
             case 'Fiscal Quarter':
                 [$quarter, $year] = explode('-', substr($key, 3));
-                $start = Carbon::parse($this->fiscalYearStartDate)->subYears(now()->year - $year)->addMonths(($quarter - 1) * 3)->startOfDay();
+                $start = Carbon::parse($this->fiscalYearStartDate)->subYears($currentYear - $year)->addMonths(($quarter - 1) * 3)->startOfDay();
                 $end = $start->copy()->addMonths(3)->subDay()->startOfDay();
 
                 break;