Andrew Wallo 2 months ago
parent
commit
f7411edc7c
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      app/Filament/Company/Pages/Reports/BaseReportPage.php

+ 2
- 2
app/Filament/Company/Pages/Reports/BaseReportPage.php View File

122
         if ($endDateField && ! $startDateField) {
122
         if ($endDateField && ! $startDateField) {
123
             $this->setFilterState('dateRange', $this->getDefaultDateRange());
123
             $this->setFilterState('dateRange', $this->getDefaultDateRange());
124
             $defaultEndDate = Carbon::parse($this->fiscalYearEndDate);
124
             $defaultEndDate = Carbon::parse($this->fiscalYearEndDate);
125
-            $this->setFilterState($endDateField, $defaultEndDate->isFuture() ? now()->endOfDay()->toDateTimeString() : $defaultEndDate->endOfDay()->toDateTimeString());
125
+            $this->setFilterState($endDateField, $defaultEndDate->isFuture() ? company_now()->endOfDay()->toDateTimeString() : $defaultEndDate->endOfDay()->toDateTimeString());
126
 
126
 
127
             return;
127
             return;
128
         }
128
         }
177
     public function setDateRange(Carbon $start, Carbon $end): void
177
     public function setDateRange(Carbon $start, Carbon $end): void
178
     {
178
     {
179
         $this->setFilterState('startDate', $start->startOfDay()->toDateTimeString());
179
         $this->setFilterState('startDate', $start->startOfDay()->toDateTimeString());
180
-        $this->setFilterState('endDate', $end->isFuture() ? now()->endOfDay()->toDateTimeString() : $end->endOfDay()->toDateTimeString());
180
+        $this->setFilterState('endDate', $end->isFuture() ? company_now()->endOfDay()->toDateTimeString() : $end->endOfDay()->toDateTimeString());
181
     }
181
     }
182
 
182
 
183
     public function getFormattedStartDate(): string
183
     public function getFormattedStartDate(): string

Loading…
Cancel
Save